Merge commit '1884d99a7ab74dd53d9134d6200bb0aff3867f8c'
* commit '1884d99a7ab74dd53d9134d6200bb0aff3867f8c':
The java version changed, and we made envsetup automatically find the right JAVA_HOME.
Merge commit 'aee4daacc804bbcd1df551cc2229d12fa5c35c24' into gingerbread-plus-aosp
* commit 'aee4daacc804bbcd1df551cc2229d12fa5c35c24':
The java version changed, and we made envsetup automatically find the right JAVA_HOME.
The path to the Java toolchain is now explicitly
specified so no manual configuration should be
required.
Change-Id: I84abc122c557372e77e4579e9a9efe56af2b412c
Merge commit 'f319c635a85aca77b2f93f2a352295dba28c946b' into gingerbread-plus-aosp
* commit 'f319c635a85aca77b2f93f2a352295dba28c946b':
Add new "libandroid" to prelink map.
Merge commit '4b137047210a1e64df1ebc0807d4eeeac7052c1e' into gingerbread-plus-aosp
* commit '4b137047210a1e64df1ebc0807d4eeeac7052c1e':
restore emma changes overwrittern by I9174f843
Merge commit '068986605b2afcd5e044b62f22ac6ecd5c15b519' into gingerbread
* commit '068986605b2afcd5e044b62f22ac6ecd5c15b519':
A nothing-to-do build should do nothing.
LOCAL_JNI_SHARED_LIBRARIES_ABI allows individual APKs to specify
specify the path where JNI shared libraries are stored in the APK. This
is useful if you want to build an APK that supports a generic version of
an ABI (e.g. armeabi) from a device configuration where
TARGET_CPU_ABI is set to a more specific version of an ABI (e.g.
armeabi-v7a.)
Note that specifying the LOCAL_JNI_SHARED_LIBRARIES_ABI does not
affect how the local JNI shared libraries are built. It just controls
where the local JNI shared libraries are placed within the APK.
Defaults to TARGET_CPU_ABI.
Change-Id: I1cbb293e0c953688945fc147c7fc367421cf860b
Merge commit 'ada132a80ba7edde00ac71727a205d55578e3f47' into gingerbread-plus-aosp
* commit 'ada132a80ba7edde00ac71727a205d55578e3f47':
Switch toolchain from gcc-4.4.0 to gcc-4.4.3
gcc-4.4.3 toolchain is based on fsf GCC-4.4.3 with numerous patches.
It reduces 3.65% code size than the prebuilt gcc-4.4.0 toolchain,
and improves 3.4% performance on Android benchmarks.
The toolchain uses gold as default linker. With gold, the toolchain
further reduces 1MB system image.
Change-Id: I55eb4df185f2932e71498fcc28428e4d1b175393
Merge commit 'b6bee6f17187a9eb3645e9519cca4a126d9aca21'
* commit 'b6bee6f17187a9eb3645e9519cca4a126d9aca21':
Remove irritating warnings about 'va_list' mangling when building C++ sources.
Merge commit '3e4677856f0e16a732cecc15cafa7efde1f21241' into gingerbread-plus-aosp
* commit '3e4677856f0e16a732cecc15cafa7efde1f21241':
Remove irritating warnings about 'va_list' mangling when building C++ sources.
Merge commit 'a943634afaf64ad2188fc8ecfb54daed40350be2' into gingerbread-plus-aosp
* commit 'a943634afaf64ad2188fc8ecfb54daed40350be2':
improvement for emma filter option
Merge commit 'c01cf7b9e6bda3f7e15aeda9cff03b6b41c5cba6' into gingerbread-plus-aosp
* commit 'c01cf7b9e6bda3f7e15aeda9cff03b6b41c5cba6':
Add a tapas command.
Rename is_unbundled_app_build and UNBUNDLED_APP_BUILD to TARGET_BUILD_APPS.
Merge commit '2b8d2383043a2b16e53538f9ebf123bfffd27ba1' into froyo-plus-aosp
* commit '2b8d2383043a2b16e53538f9ebf123bfffd27ba1':
Add a tapas command.
Rename is_unbundled_app_build and UNBUNDLED_APP_BUILD to TARGET_BUILD_APPS.
the original implementation directly embeds the filter variable into command
line; this implies that filter variable cannot contain any whitespaces,
otherwise it'll be misintepreted as a new command line argument to emma. the
side effect is that user will be forced to cram all filter related java
class/package names into one line, which could be very long. with this
change, user can use line continuation ("\") or appending ("+=") to break
up long filter specs.
Change-Id: I2c130033cdb5120251d6f84c3dd906d140d52991
