Merge commit '258b2b4504949fa95b733b149dd5f8146bfb7887' into eclair-mr2
* commit '258b2b4504949fa95b733b149dd5f8146bfb7887':
Change where makefile looks for sdk_clean.sh
Merge commit '1ae988040777f88f766fc421af79a61175e917af' into eclair
* commit '1ae988040777f88f766fc421af79a61175e917af':
Change where makefile looks for sdk_clean.sh
Merge commit '2779fa7d9fea6f61392135a231e69a3e9b89768e' into eclair-mr2
* commit '2779fa7d9fea6f61392135a231e69a3e9b89768e':
Change name of CTS DeviceInfoCollector package to TestDeviceSetup.
Merge commit '580cdbe0fe0dd794c7035d8a406353f88aad827e' into eclair-mr2
* commit '580cdbe0fe0dd794c7035d8a406353f88aad827e':
Enables nodpi drawables in the framework.
Merge commit '31597999a61c6b58b8f8b903f5f228a6ca07183f' into eclair-mr2
* commit '31597999a61c6b58b8f8b903f5f228a6ca07183f':
Support secondary CPU ABI in build.prop
BoardConfig.mk typically defines TARGET_CPU_ABI to the name of the
native machine code CPU ABI supported by the target device. For example,
existing devices today use the value 'armeabi' corresponding to an
ARMv5TE instruction set with soft-float implementation.
This patch allows this file to also define TARGET_CPU_ABI2 to name
a secondary (minor) CPU ABI also supported by the device. This is useful
when the main ABI is ARMv7-A (identified as 'armeabi-v7a') which also
supports ARMv5TE. Such devices should have TARGET_CPU_ABI defined to
'armeabi-v7a' and TARGET_CPU_ABI2 defined to 'armeabi'.
TARGET_CPU_ABI2 will be translated into the ro.product.cpu.abi2 property
in build.prop. This value will be used by the PackageManager to handle
"fat-binaries" generated with the NDK.
Merge commit '357f5bc804fc80f06776e1da141e4b322d7e3248' into eclair-mr2
* commit '357f5bc804fc80f06776e1da141e4b322d7e3248':
add the new accounts and sync package to the generic target and enable sync for all builds
Merge commit '64d5a8070630e816e62fc2d3fdcbe820f50ec924' into eclair-mr2
* commit '64d5a8070630e816e62fc2d3fdcbe820f50ec924':
Add OVERRIDE_PACKAGES support for prebuild modules.
Merge commit '36f349acc9c976cf3966ebde5df6410a09a3d7a5' into eclair-mr2
* commit '36f349acc9c976cf3966ebde5df6410a09a3d7a5':
Add support for LOCAL_OVERRIDES_PACKAGES to prebuilt build rules.
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.
(This is a cherry-pick of a change already submitted to eclair-mr2;
the change was approved for mr1.)
Merge commit 'aa569862dee45bfa72d342e9982cb5205df9bf04' into eclair-mr2
* commit 'aa569862dee45bfa72d342e9982cb5205df9bf04':
Windows SDK: support tools/sdklauncher and tools/layoutopt
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 '0889661cd890e49a4827da0dc5d583274347d178' into eclair-mr2
* commit '0889661cd890e49a4827da0dc5d583274347d178':
eng builds only -- make the thing that makes setupwizard optional actually work.
Merge commit '0187d84264fb6cf67650354c8c5da0a0712dbb0b' into eclair-mr2
* commit '0187d84264fb6cf67650354c8c5da0a0712dbb0b':
Part of issue #2168428: STOP SHIP: Bump API version to 5
This bumps the API version. We are still going to be an Eclair
development version until prebuilts are updated.
Change-Id: Ie76f3cda15b6c2c0b924db614e8024c04ce5a035
Store the location of the releasetools extensions in the target-files
zip, and make ota_from_target_files use that stored location by
default (though it can still be overridden with -s if desired).
Our yaffs filesystems reserve 5 blocks, use 1 for a checkpoint, and
may use 1 or 2 more for caching. Take these all into account when
computing the max image size.
