Merge commit '6ebf443631025b132f644bd349258192db4e3e9c'
* commit '6ebf443631025b132f644bd349258192db4e3e9c':
use aapt to build jar files instead of the system zip
Merge commit 'feec1ce3e01c93f43f425747df8073e9580d775a'
* commit 'feec1ce3e01c93f43f425747df8073e9580d775a':
Windows SDK: support tools/sdklauncher and tools/layoutopt
Merge commit 'aa569862dee45bfa72d342e9982cb5205df9bf04' into eclair-plus-aosp
* commit 'aa569862dee45bfa72d342e9982cb5205df9bf04':
Windows SDK: support tools/sdklauncher and tools/layoutopt
Merge commit 'aa569862dee45bfa72d342e9982cb5205df9bf04' into eclair-mr2
* commit 'aa569862dee45bfa72d342e9982cb5205df9bf04':
Windows SDK: support tools/sdklauncher and tools/layoutopt
Merge commit '160028f8325e9e1face3fc6f17baef498ee3e53d'
* commit '160028f8325e9e1face3fc6f17baef498ee3e53d':
move recovery image to the top of the OTA package
Merge commit 'ce017f01d006d3e953f3a38f9489360ecd5d0695'
* commit 'ce017f01d006d3e953f3a38f9489360ecd5d0695':
Add a cleanspec rule for the change to bump the API version to 5.
Merge commit 'cb9102e056e8553745c2abd942852232bfadd98b'
* commit 'cb9102e056e8553745c2abd942852232bfadd98b':
eng builds only -- make the thing that makes setupwizard optional actually work.
Merge commit 'de7e9e6e8fc4044dbc48f1687af92e7aae1d6638'
* commit 'de7e9e6e8fc4044dbc48f1687af92e7aae1d6638':
Part of issue #2168428: STOP SHIP: Bump API version to 5
Merge commit 'ad37305edb98df08d71fd27e7d1df6a082a76da3'
* commit 'ad37305edb98df08d71fd27e7d1df6a082a76da3':
Bug in Mac build where it gets confused over case, fix no longer needed.
Merge commit 'fb74a21f4792e08c1ebee5d0347698885e31d805'
* commit 'fb74a21f4792e08c1ebee5d0347698885e31d805':
Speed up warn.py about 30x by precompiling all the regular expressions.
Merge commit 'f13231ef8afc6eb2f1ffc14a61d106daa5be8de5'
* commit 'f13231ef8afc6eb2f1ffc14a61d106daa5be8de5':
BUILD SYSTEM ONLY - Add TARGET_BUILD_VARIANT to buildspec.mk.default,
By using 'aapt add' instead of whatever 'zip' utility happens to be
installed on the machine, we get files that are imgdiff-friendly,
which makes for smaller incremental OTAs.
Merge commit 'ff6f3fe4482bcad900bce2e78204ad5cb466bbf9' into eclair-mr2
* commit 'ff6f3fe4482bcad900bce2e78204ad5cb466bbf9':
Finish issue #2168428: STOP SHIP: Bump API version to 5.
Merge commit 'ff6f3fe4482bcad900bce2e78204ad5cb466bbf9' into eclair-plus-aosp
* commit 'ff6f3fe4482bcad900bce2e78204ad5cb466bbf9':
Finish issue #2168428: STOP SHIP: Bump API version to 5.
Merge commit 'f2b32f2a4b7279a92ef0870277bc99c659ee28f4' into eclair-mr2
* commit 'f2b32f2a4b7279a92ef0870277bc99c659ee28f4':
move recovery image to the top of the OTA package
Merge commit 'f2b32f2a4b7279a92ef0870277bc99c659ee28f4' into eclair-plus-aosp
* commit 'f2b32f2a4b7279a92ef0870277bc99c659ee28f4':
move recovery image to the top of the OTA package
Make the recovery image be the first thing installed in system/ in the
OTA package, so it will get installed even if the system partition
fills during OTA installation.
Merge commit '979d5567b72b4f3a8219b4786f9f512601645121' into eclair-plus-aosp
* commit '979d5567b72b4f3a8219b4786f9f512601645121':
Add a cleanspec rule for the change to bump the API version to 5.
Merge commit '0889661cd890e49a4827da0dc5d583274347d178' into eclair-plus-aosp
* commit '0889661cd890e49a4827da0dc5d583274347d178':
eng builds only -- make the thing that makes setupwizard optional actually work.
Merge commit '0187d84264fb6cf67650354c8c5da0a0712dbb0b' into eclair-plus-aosp
* commit '0187d84264fb6cf67650354c8c5da0a0712dbb0b':
Part of issue #2168428: STOP SHIP: Bump API version to 5
Merge commit 'c51aa3bd0d4dab1e8d842db4afd6053e0111d84a' into eclair-plus-aosp
* commit 'c51aa3bd0d4dab1e8d842db4afd6053e0111d84a':
Bug in Mac build where it gets confused over case, fix no longer needed.
Merge commit 'f885d876a273bc76b0f5a35c9ea2346f4a5b4d59' into eclair-plus-aosp
* commit 'f885d876a273bc76b0f5a35c9ea2346f4a5b4d59':
Speed up warn.py about 30x by precompiling all the regular expressions.
Merge commit 'ea79e65fc656351ffeae1daa2cc40abba05d56b9' into eclair-plus-aosp
* commit 'ea79e65fc656351ffeae1daa2cc40abba05d56b9':
BUILD SYSTEM ONLY - Add TARGET_BUILD_VARIANT to buildspec.mk.default,