Commit graph

816 commits

Author SHA1 Message Date
Andreas Huber
5f9168c0d5 am c55bb9ec: am f2bab487: Merge "Remove now unnecessary property overrides to opt into stagefright." into gingerbread
Merge commit 'c55bb9ecc92d34e448adec76bc06abdcd3c35f0e'

* commit 'c55bb9ecc92d34e448adec76bc06abdcd3c35f0e':
  Remove now unnecessary property overrides to opt into stagefright.
2010-06-24 09:10:19 -07:00
Andreas Huber
c55bb9ecc9 am f2bab487: Merge "Remove now unnecessary property overrides to opt into stagefright." into gingerbread
Merge commit 'f2bab487cc71a8a210ff98d21172d62edcaa6d2a' into gingerbread-plus-aosp

* commit 'f2bab487cc71a8a210ff98d21172d62edcaa6d2a':
  Remove now unnecessary property overrides to opt into stagefright.
2010-06-24 09:08:43 -07:00
Andreas Huber
f2bab487cc Merge "Remove now unnecessary property overrides to opt into stagefright." into gingerbread 2010-06-24 09:05:19 -07:00
Ying Wang
a52c4f31dc am 48de6ce7: am 7b142da3: Fix javadoc for Java 6.
Merge commit '48de6ce732a797f5c61186a3e57bec535e37d873'

* commit '48de6ce732a797f5c61186a3e57bec535e37d873':
  Fix javadoc for Java 6.
2010-06-23 21:30:04 -07:00
Ying Wang
48de6ce732 am 7b142da3: Fix javadoc for Java 6.
Merge commit '7b142da3ce3849e56134666566df3f04f033c57d' into gingerbread-plus-aosp

* commit '7b142da3ce3849e56134666566df3f04f033c57d':
  Fix javadoc for Java 6.
2010-06-23 21:28:50 -07:00
Ying Wang
7b142da3ce Fix javadoc for Java 6.
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
2010-06-23 20:59:22 -07:00
Andreas Huber
e3bbae0382 Remove now unnecessary property overrides to opt into stagefright.
Change-Id: I9810030e5576ac5a9cb31fcf0ce3f0baa96f6f40
related-to-bug: 2370115
2010-06-23 16:55:06 -07:00
Joe Onorato
74ba0c834f am 1884d99a: am aee4daac: The java version changed, and we made envsetup automatically find the right JAVA_HOME.
Merge commit '1884d99a7ab74dd53d9134d6200bb0aff3867f8c'

* commit '1884d99a7ab74dd53d9134d6200bb0aff3867f8c':
  The java version changed, and we made envsetup automatically find the right JAVA_HOME.
2010-06-23 16:04:38 -07:00
Joe Onorato
1884d99a7a am aee4daac: 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.
2010-06-23 16:02:49 -07:00
Joe Onorato
aee4daacc8 The java version changed, and we made envsetup automatically find the right JAVA_HOME.
This change forces everyone to re-source envsetup.sh

Change-Id: Ieb9512d5725cca26a83debf9b0480bc20e19d5ee
2010-06-23 14:03:13 -07:00
Jeff Hamilton
ba3897fdf1 am 66d41149: am 4a1c70e5: Switch the required host Java environment to 1.6.
Merge commit '66d41149d94fc7153467f9e1b0af55518ba86565'

* commit '66d41149d94fc7153467f9e1b0af55518ba86565':
  Switch the required host Java environment to 1.6.
2010-06-23 13:02:09 -07:00
Jeff Hamilton
66d41149d9 am 4a1c70e5: Switch the required host Java environment to 1.6.
Merge commit '4a1c70e53be40fd1b2c14eb7c0acc93f6df865bc' into gingerbread-plus-aosp

* commit '4a1c70e53be40fd1b2c14eb7c0acc93f6df865bc':
  Switch the required host Java environment to 1.6.
2010-06-23 12:49:54 -07:00
Dianne Hackborn
9a4e5f4a30 am a41921ed: am f319c635: Add new "libandroid" to prelink map.
Merge commit 'a41921ed7e3cfccc40db3f8d2b1e4059b0715ebd'

* commit 'a41921ed7e3cfccc40db3f8d2b1e4059b0715ebd':
  Add new "libandroid" to prelink map.
2010-06-23 10:32:12 -07:00
Jeff Hamilton
4a1c70e53b Switch the required host Java environment to 1.6.
The path to the Java toolchain is now explicitly
specified so no manual configuration should be
required.

Change-Id: I84abc122c557372e77e4579e9a9efe56af2b412c
2010-06-22 16:45:41 -05:00
Dianne Hackborn
a41921ed7e am f319c635: Add new "libandroid" to prelink map.
Merge commit 'f319c635a85aca77b2f93f2a352295dba28c946b' into gingerbread-plus-aosp

* commit 'f319c635a85aca77b2f93f2a352295dba28c946b':
  Add new "libandroid" to prelink map.
2010-06-22 11:24:18 -07:00
Dianne Hackborn
f319c635a8 Add new "libandroid" to prelink map.
Change-Id: I10bc30088fced39b2875bbbc19e33c53fa8352d7
2010-06-21 18:15:57 -07:00
Guang Zhu
878c62ae14 resolved conflicts for merge of 10b3f4b8 to master
Change-Id: I169c45161af01596c408cd3f3173d67cb541cb46
2010-06-21 13:00:53 -07:00
Guang Zhu
10b3f4b8fc am 4b137047: restore emma changes overwrittern by I9174f843
Merge commit '4b137047210a1e64df1ebc0807d4eeeac7052c1e' into gingerbread-plus-aosp

* commit '4b137047210a1e64df1ebc0807d4eeeac7052c1e':
  restore emma changes overwrittern by I9174f843
2010-06-21 12:51:44 -07:00
Guang Zhu
4b13704721 restore emma changes overwrittern by I9174f843
Change-Id: Ic5199ddfdaa2f8366bda960be84464945726e2f5
2010-06-21 12:34:51 -07:00
The Android Open Source Project
e1fef62bce merge from froyo-plus-aosp - DO NOT MERGE
Change-Id: I5ddea1d56218732cf5cba16e0c8db18399b7f504
2010-06-21 10:55:21 -07:00
Ying Wang
205591981c resolved conflicts for merge of 34d37e50 to master
Change-Id: Ie7083ec2c87eb3fd28ea31002267f12ffe4426fa
2010-06-21 10:14:01 -07:00
Ying Wang
45113a7faa am 06898660: A nothing-to-do build should do nothing.
Merge commit '068986605b2afcd5e044b62f22ac6ecd5c15b519' into gingerbread

* commit '068986605b2afcd5e044b62f22ac6ecd5c15b519':
  A nothing-to-do build should do nothing.
2010-06-21 08:47:44 -07:00
Jack Palevich
21f597ba5c Merge "Add LOCAL_JNI_SHARED_LIBRARIES_ABI build variable." 2010-06-18 15:06:07 -07:00
Ying Wang
24de970748 Increase memory for Javadoc.
sdk builds continue breaking for out of memory..

Change-Id: Ie056241309f0303cdd4857cfb1421996811b1a8a
2010-06-18 13:18:05 -07:00
Jean-Baptiste Queru
979e4765e7 Change branch name to openmaster, to avoid confusion
Change-Id: Ibd0e460fd0f0c5d6fa4c1f858fbc280a0bcf7f1a
2010-06-18 08:11:13 -07:00
Jack Palevich
a0ab29b986 Add LOCAL_JNI_SHARED_LIBRARIES_ABI build variable.
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
2010-06-18 15:38:07 +08:00
Ying Wang
068986605b A nothing-to-do build should do nothing.
Before this CL, ota_from_target_files is always executed even with no new change.

Change-Id: I29d6aef3c60e5b0229551a3bf22f2d31cb41f219
2010-06-17 17:52:18 -07:00
Ying Wang
840182d8ad Merge "extfs support for img_from_target_files" 2010-06-17 13:37:50 -07:00
Ying Wang
933abf15bc extfs support for img_from_target_files
Change-Id: Ie3df70426066bff467792b8528bc4528eb6afe15
2010-06-17 11:25:27 -07:00
Jean-Baptiste Queru
2eb35f020f am 7aba65bb: merge from froyo-plus-aosp
Merge commit '7aba65bb2b38ade61f5edd4d9f92c58953505ed1'

* commit '7aba65bb2b38ade61f5edd4d9f92c58953505ed1':
  Revert "Build BUILD_MULTI_PREBUILT for the prebuilt target"
2010-06-17 10:05:54 -07:00
Jean-Baptiste Queru
7aba65bb2b merge from froyo-plus-aosp
Change-Id: Ica7f3076728f549ce94dd90584bdc24ee84ced15
2010-06-17 10:01:30 -07:00
The Android Open Source Project
aa90e9eac8 merge from open-source master
Change-Id: I55d36474223c79e6ab5000b2cb09b01762eb3823
2010-06-17 09:58:36 -07:00
Jean-Baptiste Queru
7ef314546b Revert "Build BUILD_MULTI_PREBUILT for the prebuilt target"
This reverts commit 9bfd697cff,
which was causing all prebuilts to be installed in all builds.

Change-Id: Ia5973b31d23bd74ec187b9e44715dea56c063efe
2010-06-17 09:30:37 -07:00
Jing Yu
96c286daf1 am eed926c8: am ada132a8: Switch toolchain from gcc-4.4.0 to gcc-4.4.3
Merge commit 'eed926c889382073c74de43a0d15e37462623cf3'

* commit 'eed926c889382073c74de43a0d15e37462623cf3':
  Switch toolchain from gcc-4.4.0 to gcc-4.4.3
2010-06-16 20:47:01 -07:00
Jing Yu
eed926c889 am ada132a8: Switch toolchain from gcc-4.4.0 to gcc-4.4.3
Merge commit 'ada132a80ba7edde00ac71727a205d55578e3f47' into gingerbread-plus-aosp

* commit 'ada132a80ba7edde00ac71727a205d55578e3f47':
  Switch toolchain from gcc-4.4.0 to gcc-4.4.3
2010-06-16 20:44:14 -07:00
Jing Yu
ada132a80b 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
2010-06-16 20:17:19 -07:00
David 'Digit' Turner
fc7b7827fc am b6bee6f1: am 3e467785: Remove irritating warnings about \'va_list\' mangling when building C++ sources.
Merge commit 'b6bee6f17187a9eb3645e9519cca4a126d9aca21'

* commit 'b6bee6f17187a9eb3645e9519cca4a126d9aca21':
  Remove irritating warnings about 'va_list' mangling when building C++ sources.
2010-06-16 19:41:44 -07:00
David 'Digit' Turner
b6bee6f171 am 3e467785: 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.
2010-06-16 17:02:44 -07:00
Ying Wang
6a7ce1c778 Merge "Move definition of build-userimage-ext-target to build/" 2010-06-16 16:56:03 -07:00
David 'Digit' Turner
3e4677856f Remove irritating warnings about 'va_list' mangling when building C++ sources.
Change-Id: I6305e93515e57462e7c57af0cc41a659e4190696
2010-06-16 16:04:55 -07:00
Guang Zhu
63f7dad434 am 4873beb5: am a943634a: Merge "improvement for emma filter option" into gingerbread
Merge commit '4873beb5b018d74a3b38403f34628ed6c3435888'

* commit '4873beb5b018d74a3b38403f34628ed6c3435888':
  improvement for emma filter option
2010-06-16 15:28:20 -07:00
Guang Zhu
4873beb5b0 am a943634a: Merge "improvement for emma filter option" into gingerbread
Merge commit 'a943634afaf64ad2188fc8ecfb54daed40350be2' into gingerbread-plus-aosp

* commit 'a943634afaf64ad2188fc8ecfb54daed40350be2':
  improvement for emma filter option
2010-06-16 15:26:41 -07:00
Guang Zhu
a943634afa Merge "improvement for emma filter option" into gingerbread 2010-06-16 15:25:19 -07:00
Ying Wang
c79f4da0ef Move definition of build-userimage-ext-target to build/
Change-Id: I313dc26e8c497797c3321627e13ae298b1e37723
2010-06-16 14:58:50 -07:00
Ying Wang
f9cd36a0f7 resolved conflicts for merge of 56791ebe to master
Change-Id: I7463636796f1262fd92af839102dc58d562259f7
2010-06-15 15:43:13 -07:00
Ying Wang
56791ebe26 am c01cf7b9: resolved conflicts for merge of 2b8d2383 to gingerbread
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.
2010-06-15 15:17:42 -07:00
Ying Wang
c01cf7b9e6 resolved conflicts for merge of 2b8d2383 to gingerbread
Change-Id: I9174f843f0fde139a7d582f45b027f3face5c981
2010-06-15 15:11:51 -07:00
Joe Onorato
8004266329 Require a directory that could actually exist.
Change-Id: I6030a062dc9f6a40ea32ecbb612c2b9353fc1af6
2010-06-15 17:29:19 -04:00
Joe Onorato
8aeb7cc461 am 2b8d2383: Merge changes I02214abd,I79e6f60e into froyo
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.
2010-06-15 14:24:42 -07:00
Joe Onorato
2b8d238304 Merge changes I02214abd,I79e6f60e into froyo
* changes:
  Add a tapas command.
  Rename is_unbundled_app_build and UNBUNDLED_APP_BUILD to TARGET_BUILD_APPS.
2010-06-15 13:59:01 -07:00