Merge commit 'c55bb9ecc92d34e448adec76bc06abdcd3c35f0e'
* commit 'c55bb9ecc92d34e448adec76bc06abdcd3c35f0e':
Remove now unnecessary property overrides to opt into stagefright.
Merge commit 'f2bab487cc71a8a210ff98d21172d62edcaa6d2a' into gingerbread-plus-aosp
* commit 'f2bab487cc71a8a210ff98d21172d62edcaa6d2a':
Remove now unnecessary property overrides to opt into stagefright.
If you don't set bootclasspath, there would be errors like:
javadoc: error - In doclet class DroidDoc, method start has thrown an exception java.lang.reflect.InvocationTargetException
Change-Id: I1b83360cb595d50577c6043d6e91b0f92e4c04d6
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 '06acf91f65015f8588f2621b89b8088b4664f9a3' into gingerbread-plus-aosp
* commit '06acf91f65015f8588f2621b89b8088b4664f9a3':
include build timestamp in OTA metadata
Merge commit '3b85269cfe10ec15e9b544dd6964b8c9f5f761f9' into gingerbread
* commit '3b85269cfe10ec15e9b544dd6964b8c9f5f761f9':
include build timestamp in OTA metadata
Merge commit '4b137047210a1e64df1ebc0807d4eeeac7052c1e' into gingerbread-plus-aosp
* commit '4b137047210a1e64df1ebc0807d4eeeac7052c1e':
restore emma changes overwrittern by I9174f843
Merge commit 'e1fef62bce230b9eb8a2a2c910d593f87e8173be'
* commit 'e1fef62bce230b9eb8a2a2c910d593f87e8173be':
Change branch name to openmaster, to avoid confusion
Merge commit '45113a7faa37747032be887ed12dd0e440524229' into gingerbread-plus-aosp
* commit '45113a7faa37747032be887ed12dd0e440524229':
A nothing-to-do build should do nothing.
Merge commit '068986605b2afcd5e044b62f22ac6ecd5c15b519' into froyo-plus-aosp
* commit '068986605b2afcd5e044b62f22ac6ecd5c15b519':
A nothing-to-do build should do nothing.
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.
