Merge commit 'd867551efea52a7d342b8fd2ed08fc9939090e88' into eclair-mr2-plus-aosp
* commit 'd867551efea52a7d342b8fd2ed08fc9939090e88':
Add the JNI test to the CTS list.
Merge commit 'ffbe862d05cb69278a26fb41950a2ce313451f49' into eclair-mr2
* commit 'ffbe862d05cb69278a26fb41950a2ce313451f49':
Add the JNI test to the CTS list.
Merge commit '07e1232a2dc2887ba0003d629032c21fbb426652' into eclair-mr2-plus-aosp
* commit '07e1232a2dc2887ba0003d629032c21fbb426652':
Update version name to 2.1 and API to 7.
Merge commit 'ffbe862d05cb69278a26fb41950a2ce313451f49' into eclair-plus-aosp
* commit 'ffbe862d05cb69278a26fb41950a2ce313451f49':
Add the JNI test to the CTS list.
Merge commit '90b35770c227f9b4ad56194de627593496acf724' into eclair-plus-aosp
* commit '90b35770c227f9b4ad56194de627593496acf724':
Update version name to 2.1 and API to 7.
Merge commit 'f711e3494ca8e740c19f77ec753051e0517208a3'
* commit 'f711e3494ca8e740c19f77ec753051e0517208a3':
Include the common source files directly in the framework library
Merge commit '89715318b22014e2a2a683fe4300dffc2dd5e512'
* commit '89715318b22014e2a2a683fe4300dffc2dd5e512':
Fix a Windows-only discrepency in the Windows SDK build.
Merge commit '08ab72b3512f59edb45d6156611a72d3a8d04a4e'
* commit '08ab72b3512f59edb45d6156611a72d3a8d04a4e':
Fix the Windows SDK build for the development to sdk split.
Merge commit '1f816cf57b93654638989e6007d669c04b3d9b88' into eclair-mr2-plus-aosp
* commit '1f816cf57b93654638989e6007d669c04b3d9b88':
Include the common source files directly in the framework library
Merge commit 'c3d743d262cd69e817524f8a4e5554ef29ffa837' into eclair-mr2-plus-aosp
* commit 'c3d743d262cd69e817524f8a4e5554ef29ffa837':
Fix a Windows-only discrepency in the Windows SDK build.
Merge commit '6f5cb991f61acbc21090c3744d5bf16b01b7aa52' into eclair-mr2-plus-aosp
* commit '6f5cb991f61acbc21090c3744d5bf16b01b7aa52':
Fix the Windows SDK build for the development to sdk split.
Merge commit '802bb072c2d9efaac1c46ac13d7e69a0aaf936a9' into eclair-mr2-plus-aosp
* commit '802bb072c2d9efaac1c46ac13d7e69a0aaf936a9':
Change where makefile looks for sdk_clean.sh
Merge commit '82a36c3b36a3f80b7c2d6ea382af91cc4e2bca32'
* commit '82a36c3b36a3f80b7c2d6ea382af91cc4e2bca32':
Change name of CTS DeviceInfoCollector package to TestDeviceSetup.
Merge commit '81d88c31be80493886e6844ebf8af8a03273208c' into eclair-plus-aosp
* commit '81d88c31be80493886e6844ebf8af8a03273208c':
Fix a Windows-only discrepency in the Windows SDK build.
Merge commit 'f15e028fe822069e44b0e06fa91f537048538f94' into eclair-plus-aosp
* commit 'f15e028fe822069e44b0e06fa91f537048538f94':
Fix the Windows SDK build for the development to sdk split.
Merge commit '258b2b4504949fa95b733b149dd5f8146bfb7887' into eclair-plus-aosp
* commit '258b2b4504949fa95b733b149dd5f8146bfb7887':
Change where makefile looks for sdk_clean.sh
* changes:
Include the common source files directly in the framework library when building, to allow mutual interdependencies; the common static library will be built independently.
Merge commit '81d88c31be80493886e6844ebf8af8a03273208c' into eclair-mr2
* commit '81d88c31be80493886e6844ebf8af8a03273208c':
Fix a Windows-only discrepency in the Windows SDK build.
Merge commit 'f15e028fe822069e44b0e06fa91f537048538f94' into eclair-mr2
* commit 'f15e028fe822069e44b0e06fa91f537048538f94':
Fix the Windows SDK build for the development to sdk split.
Merge commit '258b2b4504949fa95b733b149dd5f8146bfb7887' into eclair-mr2
* commit '258b2b4504949fa95b733b149dd5f8146bfb7887':
Change where makefile looks for sdk_clean.sh
Merge commit 'd920ec8354940653e6cf53a1540360cca3bcc5f7' into eclair
* commit 'd920ec8354940653e6cf53a1540360cca3bcc5f7':
Fix a Windows-only discrepency in the Windows SDK build.
Merge commit 'a62a442129a28bf3a62139183868a13b91e976ad' into eclair
* commit 'a62a442129a28bf3a62139183868a13b91e976ad':
Fix the Windows SDK build for the development to sdk split.
Merge commit '1ae988040777f88f766fc421af79a61175e917af' into eclair
* commit '1ae988040777f88f766fc421af79a61175e917af':
Change where makefile looks for sdk_clean.sh
Merge commit 'b4805a18e51d3a18caa2cac821479a9535778d58' into eclair-mr2-plus-aosp
* commit 'b4805a18e51d3a18caa2cac821479a9535778d58':
Change name of CTS DeviceInfoCollector package to TestDeviceSetup.
Merge commit '2779fa7d9fea6f61392135a231e69a3e9b89768e' into eclair-plus-aosp
* commit '2779fa7d9fea6f61392135a231e69a3e9b89768e':
Change name of CTS DeviceInfoCollector package to TestDeviceSetup.
Merge commit '2779fa7d9fea6f61392135a231e69a3e9b89768e' into eclair-mr2
* commit '2779fa7d9fea6f61392135a231e69a3e9b89768e':
Change name of CTS DeviceInfoCollector package to TestDeviceSetup.
For some reason, there's a slight behavior difference between
my Windowss machine and the Windows build servers, that is on
mine the include of framework/base results in duplicate build
rules being defined. My machine used to work like the Windows
build server and the behavior mysteriously changed a while
ago. This change should make it all work the same on all boxes.
Change-Id: I45e02e9eadfc586f86caa6a2690deda9648e600d
Merge commit '573205f4838cf0369fd6a7028c793726d1eb8620' into eclair-mr2-plus-aosp
* commit '573205f4838cf0369fd6a7028c793726d1eb8620':
Remove external/googleclient (the code moved elsewhere)
Merge commit '34ce59147ca68f81a36ab05533a90199147ef3c7' into eclair-mr2-plus-aosp
* commit '34ce59147ca68f81a36ab05533a90199147ef3c7':
Add the example test to the CTS.
Merge commit 'c3d9645e29aeb124b39a0b7639767a5f1fead229' into eclair-plus-aosp
* commit 'c3d9645e29aeb124b39a0b7639767a5f1fead229':
Add the example test to the CTS.
Merge commit '0774bf3ebd65c22d8cafb18e868bd2bbc1a0c4c9' into eclair-mr2-plus-aosp
* commit '0774bf3ebd65c22d8cafb18e868bd2bbc1a0c4c9':
Enables nodpi drawables in the framework.
Merge commit '580cdbe0fe0dd794c7035d8a406353f88aad827e' into eclair-mr2
* commit '580cdbe0fe0dd794c7035d8a406353f88aad827e':
Enables nodpi drawables in the framework.
Merge commit '580cdbe0fe0dd794c7035d8a406353f88aad827e' into eclair-plus-aosp
* commit '580cdbe0fe0dd794c7035d8a406353f88aad827e':
Enables nodpi drawables in the framework.
Merge commit '002d1c24b4dee2582e660f80669176c4a3e2db33' into eclair-mr2-plus-aosp
* commit '002d1c24b4dee2582e660f80669176c4a3e2db33':
Support secondary CPU ABI in build.prop
Merge commit '31597999a61c6b58b8f8b903f5f228a6ca07183f' into eclair-plus-aosp
* commit '31597999a61c6b58b8f8b903f5f228a6ca07183f':
Support secondary CPU ABI in build.prop
Merge commit '31597999a61c6b58b8f8b903f5f228a6ca07183f' into eclair-mr2
* commit '31597999a61c6b58b8f8b903f5f228a6ca07183f':
Support secondary CPU ABI in build.prop
Merge commit 'e1b710a5ba16be660d5383f1e56bd76b664b1d05'
* commit 'e1b710a5ba16be660d5383f1e56bd76b664b1d05':
Added prune options to findleaves.sh to ignore the .git and .repo
Added a default to specify an alternative tool chain prefix if needed.
Update prelink map for libFLAC
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 'ebed06a259eb1c00112a4e3a9d6d721700bbaedb'
* commit 'ebed06a259eb1c00112a4e3a9d6d721700bbaedb':
remove reference to SK_RELEASE, since that is automatically set based on NDEBUG (or its absence)
Merge commit '65a731b737bd6e8afa0b18176064dcc130dbb4ce' into eclair-mr2-plus-aosp
* commit '65a731b737bd6e8afa0b18176064dcc130dbb4ce':
remove reference to SK_RELEASE, since that is automatically set based on NDEBUG (or its absence)
directories since the Android.mk files will not be found in these
directories.
Prunning out these directories decreased the make parse by nearly
a minute on a cold cache and eliminated 60,000+ stats on files in
the .git and .repo directories.
Merge commit '6f007cf96c21b1dfce6e258eee5c2963aa86bcf1'
* commit '6f007cf96c21b1dfce6e258eee5c2963aa86bcf1':
add the new accounts and sync package to the generic target and enable sync for all builds
Merge commit 'aa82f8ee8f747e4466f3f6754201765a2b5b3707' into eclair-mr2-plus-aosp
* commit 'aa82f8ee8f747e4466f3f6754201765a2b5b3707':
add the new accounts and sync package to the generic target and enable sync for all builds
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 '357f5bc804fc80f06776e1da141e4b322d7e3248' into eclair-plus-aosp
* commit '357f5bc804fc80f06776e1da141e4b322d7e3248':
add the new accounts and sync package to the generic target and enable sync for all builds
Merge commit '8a5d527223414c3c23b8021eb8ed468d3299e968' into eclair-mr2-plus-aosp
* commit '8a5d527223414c3c23b8021eb8ed468d3299e968':
Bump version to 2.1 API 6.
Merge commit '3fa115999c8512095301724f557821f25ddfe08f' into eclair-plus-aosp
* commit '3fa115999c8512095301724f557821f25ddfe08f':
Bump version to 2.1 API 6.
In particular don't put the symbol indices from included .a files into
them. I didn't change the equivalent device rule ala the "if it ain't
broke" rule of thumb.
Change-Id: I064ac356a6f48f93fca2cd08a8408ca835f8f9a4
Merge commit '21e91f357a45069eaa55542dc9f46d1293d1c21c'
* commit '21e91f357a45069eaa55542dc9f46d1293d1c21c':
Add support for LOCAL_OVERRIDES_PACKAGES to prebuilt build rules.
Merge commit '355670b98584210502f96fe0446a854f07026c28' into eclair-mr2-plus-aosp
* commit '355670b98584210502f96fe0446a854f07026c28':
Add OVERRIDE_PACKAGES support for prebuild modules.
Merge commit 'c6c462434c17dfbbe3128b2a2804f5d2417ebadb' into eclair-mr2-plus-aosp
* commit 'c6c462434c17dfbbe3128b2a2804f5d2417ebadb':
Add support for LOCAL_OVERRIDES_PACKAGES to prebuilt build rules.
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.
Merge commit '64d5a8070630e816e62fc2d3fdcbe820f50ec924' into eclair-plus-aosp
* commit '64d5a8070630e816e62fc2d3fdcbe820f50ec924':
Add OVERRIDE_PACKAGES support for prebuild modules.
Merge commit '36f349acc9c976cf3966ebde5df6410a09a3d7a5' into eclair-plus-aosp
* commit '36f349acc9c976cf3966ebde5df6410a09a3d7a5':
Add support for LOCAL_OVERRIDES_PACKAGES to prebuilt build rules.
Merge commit 'decdbd7956c34895f73001cfa2018a27c8702ad0' into eclair-plus-aosp
* commit 'decdbd7956c34895f73001cfa2018a27c8702ad0':
use aapt to build jar files instead of the system zip (DO NOT MERGE)
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.)
LOCAL_WHOLE_STATIC_LIBRARIES.
While I was in the territory, I reordered a few lines to be more
consistent with nearby code/files.
Change-Id: Ie9809f065e32ca748ae4539dd785980ff496c2d2
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-mr2
* commit 'aa569862dee45bfa72d342e9982cb5205df9bf04':
Windows SDK: support tools/sdklauncher and tools/layoutopt
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
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).
Merge commit '9db1fc2bea0b75b59ad52f94faa1e7d66209d2d2'
* commit '9db1fc2bea0b75b59ad52f94faa1e7d66209d2d2':
Make $(my-dir) fail if it's called after including $(CLEAR_VARS)
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.
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.
The WebKit library link line is exceeding 128KB on sim-eng builds.
The path to sim-eng object files is slightly longer than device builds
because the object files live under the "host" directory.
This change truncates the "product" directory name to "pr", reducing the
command line by a few KB. This only affects sim-eng builds.
The real fix will need be to webkit (see internal bug 1917987), which
will eventually start failing on device builds if it continues to grow.
* changes:
Add the ability to turn on proguard for java targets, and to call aapt to generate a rules file for proguard for stuff from the manifest and other resources that need to be kept.
This is done by appending "mdpi" (medium density or 160 dpi, which is what
we've been using so far on dream etc.) to PRODUCT_LOCALES if no other dpi is
found there. (PRODUCT_LOCALES is then sent as a configuration parameter to
aapt to determine which resources should be included in the build.)
With this change, each build will now include only one density of any given
asset. For example, if there exists
drawable-hdpi/foo.png
drawable-mdpi/foo.png
...then the build will include *only* drawable-mdpi/foo.png, unless the
density is overridden in the build's own device spec:
PRODUCT_LOCALES += hdpi
...in which case the build will include only drawable-hdpi/foo.png.
Merge commit '1b6d0a65fc62901f2c18d00c556bd5da50f35584' into eclair
* commit '1b6d0a65fc62901f2c18d00c556bd5da50f35584':
allow prebuilts to specify LOCAL_CERTIFICATE so they can be resigned
If a prebuilt specifies a LOCAL_CERTIFICATE, stick it in the
PACKAGES.* collection so that the predexopt process can work on the
file (which only works if the new .apk can be signed).
I removed these lines because for some reason building under Windows
fails for me when they are present. However the build server breaks
so I'll rolling them back and I'll try to understand that later.
Merge commit '6929fb57a5afb90606feb8c35c8c2cda170adfe4'
* commit '6929fb57a5afb90606feb8c35c8c2cda170adfe4':
Fix issue #2048267: Run zipalign on all prebuilts
For host side test packages, the name of the jar file containing the tests is
declared in the packages Android.mk. The name of the make file needs to be
passed to the description generator so that it can pick up this information.
The makefile was not passing on the parameter containing the make file name.
Make BoardConfig.mk store the size of the partition rather than the
maximum size of the image that can be flashed there, because the
function used to do the conversion isn't available when BoardConfig.mk
is read any more.
Change things so that when $(LOCAL_PREBUILT_STRIP_COMMENTS) is
nonempty, we copy the source file using sed to strip out all the "#
line"-style comments and blank lines, saving considerable system image
space in the case of some wifi configurations.
Bug: 2036961
This cuts the make startup time by about 30 seconds. Python is faster
than bash in this case, and also we can now supply multiple directories
to prune, and skip the .repo directory, which is, uh, big.
This is from my mac laptop:
$ time build/tools/findleaves.sh --prune="./out" . Android.mk > /dev/null
real 0m29.186s
user 0m0.550s
sys 0m5.897s
$ time build/tools/findleaves.py --prune="./out" . Android.mk > /dev/null
real 0m4.701s
user 0m0.645s
sys 0m1.294s
$ time build/tools/findleaves.py --prune="./out" --prune="./.repo" . Android.mk > /dev/null
real 0m0.176s
user 0m0.094s
sys 0m0.080s
Merge commit '1e96ac8430da922332e4c85e7eed0e95442ff2ce'
* commit '1e96ac8430da922332e4c85e7eed0e95442ff2ce':
Make the recovery.img construction (from boot.img) logic depend on whether recovery.img was installed.
The SDK build doesn't have recovery, don't try to generate a patch or
include it in the system image size calculation. Also there's a
dependency on bsdiff that was omitted.
Instead of storing the whole recovery image in system in order to
flash it on first boot, we instead use an imgdiff patch from the boot
image to create the recovery image. This is substantially smaller
since it effectively only stores the recovery binary and UI images
(the kernel and the init binary are identical to that of the boot
image).
This change modifies the OTA-building script to create and install
these patches, and changes the calculation of the system image size in
the Makefile to reflect the new scheme.
Make some changes needed to applypatch in order to store the recovery
image in the system partition as a binary patch relative to the boot
image:
- make applypatch use shared libraries, so it's smaller. It will
need to be on the main system so it can install the recovery
image. Make an applypatch_static binary for use in recovery
packages (still needed for updating cupcake devices to donut).
- output the results of patching to an in-memory buffer and write
that to the partition; there's no convenient /tmp for us to us.
(This should be basically a no-op in recovery, since /tmp is a
ramdisk anyway.)
@since tags in the code, it's pulled from the API XML files also used by
apicheck.
The code now reads the apicheck XML, and applies it's versions to the DroidDoc
class models. The models output the version to HDF, and that's picked up by
the CS templates.
The clearsilver templates will be changed to be pretty in a follow up change.
Conflicts:
tools/droiddoc/src/DroidDoc.java
That way we don't have to wait for clearsilver to write the thousands
of html files during every build.
(This is the build change, there is also a frameworks/base change)
Now, by default, instead of fully building everything,
we skip dexing the modules that aren't going to be included
in the current build.
This will slow down some of the incremental builds (like tests),
but it improves the regular eng build from 27.5 minutes on my
Mac Pro to 25 minutes. That's not as much of an improvement
as I had hoped for, but it's still better.
There is also a change in here that puts the java-source-list
file which is used to get around limited command line lengths
in the proper directory. Before this change, it was an
accident that the directory for that file existed!
* changes:
Since we're using gcc 4.4 in master, we can use the -Werror= option to make not having a virtual destructor in classes with virtual methods an error. I already fixed all code that had this problem, so now it's a matter of turning the option on. Also, as long as we don't have any C-specific options, it's probably best to copy the CPP flags from the C flags. We can always break them out later.
to make not having a virtual destructor in classes with virtual
methods an error. I already fixed all code that had this problem,
so now it's a matter of turning the option on.
Also, as long as we don't have any C-specific options, it's
probably best to copy the CPP flags from the C flags. We can
always break them out later.
