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
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
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
Guang Zhu
9cd3d8c654
improvement for emma filter option
...
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
2010-06-15 13:37:30 -07:00
The Android Open Source Project
e18e4be361
am 9f431335
: merge from froyo-plus-aosp
...
Merge commit '9f431335ab377396713b8b386ad7539b2b28eff5'
* commit '9f431335ab377396713b8b386ad7539b2b28eff5':
generic.mk: Replaced AlarmClock with newer DeskClock App
2010-06-14 11:22:20 -07:00
The Android Open Source Project
9f431335ab
merge from froyo-plus-aosp
...
Change-Id: Ie8f2b137de580bfb23a1bdee513a8a20075e40a3
2010-06-14 11:21:00 -07:00
Eric Laurent
82a93b76a8
am a67baff9
: am 71affe70
: am 484d4d54
: Merge "Added prelinked library for audio effects JNI." into kraken
...
Merge commit 'a67baff9a50be3a335e650d208d51e33e20b70e2'
* commit 'a67baff9a50be3a335e650d208d51e33e20b70e2':
Added prelinked library for audio effects JNI.
2010-06-14 09:40:05 -07:00
Eric Laurent
a67baff9a5
am 71affe70
: am 484d4d54
: Merge "Added prelinked library for audio effects JNI." into kraken
...
Merge commit '71affe70fd8f882c7c9cc7a5aca28e714241eb6e' into gingerbread-plus-aosp
* commit '71affe70fd8f882c7c9cc7a5aca28e714241eb6e':
Added prelinked library for audio effects JNI.
2010-06-14 09:38:16 -07:00
Eric Laurent
71affe70fd
am 484d4d54
: Merge "Added prelinked library for audio effects JNI." into kraken
...
Merge commit '484d4d5470336b662a5e65a1f10653c4c433cf84' into gingerbread
* commit '484d4d5470336b662a5e65a1f10653c4c433cf84':
Added prelinked library for audio effects JNI.
2010-06-14 09:37:15 -07:00
Eric Laurent
484d4d5470
Merge "Added prelinked library for audio effects JNI." into kraken
2010-06-14 09:35:24 -07:00
The Android Open Source Project
5cbd5d9ff4
merge from open-source master
...
Change-Id: I058f809f7e7eb69a757cb75f934a3630dfd7d777
2010-06-14 09:03:32 -07:00
Raphael
63c8af9aaf
Fix the build: properly detect the BUILD OS version of Java, not the host one.
...
This matters when building Windows under Linux.
Change-Id: I1eaa4eeda4df359313f16d52605a1b8298765269
2010-06-12 11:44:48 -07:00
Jean-Baptiste Queru
633c4a5094
Merge "generic.mk: Replaced AlarmClock with newer DeskClock App"
2010-06-11 15:45:15 -07:00
Ed Heyl
b55b07fef7
am e46a061d
: am d7e7e482
: am d83f3396
: Revert "Merge "Switch the required host Java environment to 1.6." into kraken"
...
Merge commit 'e46a061d08f9667783d39a60106003497c2ad41e'
* commit 'e46a061d08f9667783d39a60106003497c2ad41e':
Revert "Merge "Switch the required host Java environment to 1.6." into kraken"
2010-06-11 15:30:54 -07:00
Ed Heyl
e46a061d08
am d7e7e482
: am d83f3396
: Revert "Merge "Switch the required host Java environment to 1.6." into kraken"
...
Merge commit 'd7e7e4825293f5b623e07f854d7ed2e3470be586' into gingerbread-plus-aosp
* commit 'd7e7e4825293f5b623e07f854d7ed2e3470be586':
Revert "Merge "Switch the required host Java environment to 1.6." into kraken"
2010-06-11 15:29:06 -07:00
Ed Heyl
d7e7e48252
am d83f3396
: Revert "Merge "Switch the required host Java environment to 1.6." into kraken"
...
Merge commit 'd83f33969aa2734000338e01b84957996ef1bb34' into gingerbread
* commit 'd83f33969aa2734000338e01b84957996ef1bb34':
Revert "Merge "Switch the required host Java environment to 1.6." into kraken"
2010-06-11 15:27:29 -07:00
Ed Heyl
d83f33969a
Revert "Merge "Switch the required host Java environment to 1.6." into kraken"
...
This reverts commit 1f29d2c376
, reversing
changes made to f9f513ab33
.
2010-06-11 15:22:42 -07:00
Sriram Raman
19b9aa3cd1
am ec1c20a7
: am 6ad4e499
: am 1f29d2c3
: Merge "Switch the required host Java environment to 1.6." into kraken
...
Merge commit 'ec1c20a7077a0afb476f8ca2b290e7a01c002b1d'
* commit 'ec1c20a7077a0afb476f8ca2b290e7a01c002b1d':
Switch the required host Java environment to 1.6.
2010-06-11 12:34:09 -07:00
Sriram Raman
ec1c20a707
am 6ad4e499
: am 1f29d2c3
: Merge "Switch the required host Java environment to 1.6." into kraken
...
Merge commit '6ad4e499a6f9c0477ef430ba4ca73df533f6cadc' into gingerbread-plus-aosp
* commit '6ad4e499a6f9c0477ef430ba4ca73df533f6cadc':
Switch the required host Java environment to 1.6.
2010-06-11 12:30:53 -07:00
Sriram Raman
6ad4e499a6
am 1f29d2c3
: Merge "Switch the required host Java environment to 1.6." into kraken
...
Merge commit '1f29d2c376295cb7ba909ae2beb4904099546e89' into gingerbread
* commit '1f29d2c376295cb7ba909ae2beb4904099546e89':
Switch the required host Java environment to 1.6.
2010-06-11 12:28:12 -07:00
Sriram Raman
1f29d2c376
Merge "Switch the required host Java environment to 1.6." into kraken
2010-06-11 12:24:53 -07:00
Ying Wang
ad8cbaa718
am df249af6
: am 74a9fd08
: am a07d37b7
: Cherry-pick bug fixes from master.
...
Merge commit 'df249af6b6bd137b7a27623905f3e94a31104eef'
* commit 'df249af6b6bd137b7a27623905f3e94a31104eef':
Cherry-pick bug fixes from master.
2010-06-11 09:12:12 -07:00
Ying Wang
df249af6b6
am 74a9fd08
: am a07d37b7
: Cherry-pick bug fixes from master.
...
Merge commit '74a9fd08731f78516a6c0e81169c8e8ff7a6d9c1' into gingerbread-plus-aosp
* commit '74a9fd08731f78516a6c0e81169c8e8ff7a6d9c1':
Cherry-pick bug fixes from master.
2010-06-11 09:08:57 -07:00
Ying Wang
290f527297
am a07d37b7
: Cherry-pick bug fixes from master.
...
Merge commit 'a07d37b79300e76da5f21f532578fcd686a74b16' into froyo-plus-aosp
* commit 'a07d37b79300e76da5f21f532578fcd686a74b16':
Cherry-pick bug fixes from master.
2010-06-11 09:05:05 -07:00
Ying Wang
74a9fd0873
am a07d37b7
: Cherry-pick bug fixes from master.
...
Merge commit 'a07d37b79300e76da5f21f532578fcd686a74b16' into gingerbread
* commit 'a07d37b79300e76da5f21f532578fcd686a74b16':
Cherry-pick bug fixes from master.
2010-06-11 09:04:43 -07:00
Ed Heyl
f03c9acfec
fix platform name
...
Change-Id: Ic6507f94887ead4d710a3da85582d49a2d9b8f24
2010-06-11 02:50:18 -07:00
Ed Heyl
70fed89f03
am 4977caa7
: am 1d2c25b7
: kraken --> gingerbread
...
Merge commit '4977caa70035992921f9d3f8eaa8c6f28292171e'
* commit '4977caa70035992921f9d3f8eaa8c6f28292171e':
kraken --> gingerbread
2010-06-11 02:12:21 -07:00