OSDN Git Service
Scott Main [Fri, 25 Jun 2010 01:16:36 +0000 (18:16 -0700)]
am
7e5592c7: am
62c65665: am
81b68ad9: Merge "docs: show the download message on the SDK homepage because we no longer need to walk through the TOS" into froyo
Merge commit '
7e5592c703964c35a177c8f4514c4a9eb2135344'
* commit '
7e5592c703964c35a177c8f4514c4a9eb2135344':
docs: show the download message on the SDK homepage because we no longer
Scott Main [Fri, 25 Jun 2010 01:14:36 +0000 (18:14 -0700)]
am
62c65665: am
81b68ad9: Merge "docs: show the download message on the SDK homepage because we no longer need to walk through the TOS" into froyo
Merge commit '
62c65665589de463a557e3826dc6cb2e1ec99c2a' into gingerbread-plus-aosp
* commit '
62c65665589de463a557e3826dc6cb2e1ec99c2a':
docs: show the download message on the SDK homepage because we no longer
Scott Main [Fri, 25 Jun 2010 01:12:45 +0000 (18:12 -0700)]
am
81b68ad9: Merge "docs: show the download message on the SDK homepage because we no longer need to walk through the TOS" into froyo
Merge commit '
81b68ad95d6a8ecb8a44ad453d336dff3a059488' into gingerbread
* commit '
81b68ad95d6a8ecb8a44ad453d336dff3a059488':
docs: show the download message on the SDK homepage because we no longer
Scott Main [Fri, 25 Jun 2010 01:10:32 +0000 (18:10 -0700)]
Merge "docs: show the download message on the SDK homepage because we no longer need to walk through the TOS" into froyo
Ying Wang [Fri, 25 Jun 2010 01:04:21 +0000 (18:04 -0700)]
am
b2fe30f0: am
c955834a: am
c048c9b5: default empty tapas to TARGET_BUILD_APPS "all"
Merge commit '
b2fe30f05ee9f4ca27a0039a44e3fb3a64c0fc88'
* commit '
b2fe30f05ee9f4ca27a0039a44e3fb3a64c0fc88':
default empty tapas to TARGET_BUILD_APPS "all"
Ying Wang [Fri, 25 Jun 2010 01:02:17 +0000 (18:02 -0700)]
am
c955834a: am
c048c9b5: default empty tapas to TARGET_BUILD_APPS "all"
Merge commit '
c955834ad0715343a2245142be416f92b83e8306' into gingerbread-plus-aosp
* commit '
c955834ad0715343a2245142be416f92b83e8306':
default empty tapas to TARGET_BUILD_APPS "all"
Ying Wang [Fri, 25 Jun 2010 00:59:32 +0000 (17:59 -0700)]
am
c048c9b5: default empty tapas to TARGET_BUILD_APPS "all"
Merge commit '
c048c9b598b36dc7506a954cc0d3d80f308b1b13' into gingerbread
* commit '
c048c9b598b36dc7506a954cc0d3d80f308b1b13':
default empty tapas to TARGET_BUILD_APPS "all"
Scott Main [Thu, 24 Jun 2010 23:36:54 +0000 (16:36 -0700)]
docs: show the download message on the SDK homepage because we no longer
need to walk through the TOS
Change-Id: I46f7e7284792b2bea77cf2a88b195e8117b4e4d2
Ying Wang [Thu, 24 Jun 2010 22:08:33 +0000 (15:08 -0700)]
default empty tapas to TARGET_BUILD_APPS "all"
So that "tapas" without argument won't end in makefile-could-not-load error in unbundled branch.
Also, the magic "all" apps will build only apps, not other things.
Change-Id: Iac6dd928ee4e42996147acdab31930cd4ffa1768
Andy McFadden [Thu, 24 Jun 2010 20:32:02 +0000 (13:32 -0700)]
am
8969167d: am
bd960940: Ignore STAY_OFF_MY_LAWN when setting JAVA_HOME.
Merge commit '
8969167db684ebdbfe72dd57aea7f7bdd5de8064'
* commit '
8969167db684ebdbfe72dd57aea7f7bdd5de8064':
Ignore STAY_OFF_MY_LAWN when setting JAVA_HOME.
Andy McFadden [Thu, 24 Jun 2010 20:29:15 +0000 (13:29 -0700)]
am
bd960940: Ignore STAY_OFF_MY_LAWN when setting JAVA_HOME.
Merge commit '
bd960940e1299d69a6cdf4176cfd1f53a5dba83a' into gingerbread-plus-aosp
* commit '
bd960940e1299d69a6cdf4176cfd1f53a5dba83a':
Ignore STAY_OFF_MY_LAWN when setting JAVA_HOME.
Andy McFadden [Thu, 24 Jun 2010 19:52:51 +0000 (12:52 -0700)]
Ignore STAY_OFF_MY_LAWN when setting JAVA_HOME.
Don't check STAY_OFF_MY_LAWN in set_java_home. That function already
refuses to update JAVA_HOME if it's set to something, which should
be sufficient for anybody who doesn't want the script to mess with it.
With this change, you can get the benefits of the 1.5/1.6 auto-selection
without having to suffer through window title changes.
Change-Id: I5cfc5d6fdf26a10b42b52925f877012c0506b9a5
James Dong [Thu, 24 Jun 2010 18:59:12 +0000 (11:59 -0700)]
am
6f2bb44b: am
c1ab82ae: Merge "Use stagefright (instead of OpenCore) authoring engine by default -rebased" into gingerbread
Merge commit '
6f2bb44b4b3551738c429a25f99e42aca8913f4f'
* commit '
6f2bb44b4b3551738c429a25f99e42aca8913f4f':
Use stagefright (instead of OpenCore) authoring engine by default
Ying Wang [Thu, 24 Jun 2010 18:59:09 +0000 (11:59 -0700)]
am
8b4be231: am
8e6f821e: Avoid inheriting PRIVATE_BOOTCLASSPATH from moduels that depend on api-stubs-timestamp
Merge commit '
8b4be231519376c9dc73622be4b8a5ddc0d83805'
* commit '
8b4be231519376c9dc73622be4b8a5ddc0d83805':
Avoid inheriting PRIVATE_BOOTCLASSPATH from moduels that depend on api-stubs-timestamp
James Dong [Thu, 24 Jun 2010 18:57:25 +0000 (11:57 -0700)]
am
c1ab82ae: Merge "Use stagefright (instead of OpenCore) authoring engine by default -rebased" into gingerbread
Merge commit '
c1ab82ae6b26d12cf6d5cdad1bd0ffc0d3acfb9b' into gingerbread-plus-aosp
* commit '
c1ab82ae6b26d12cf6d5cdad1bd0ffc0d3acfb9b':
Use stagefright (instead of OpenCore) authoring engine by default
Ying Wang [Thu, 24 Jun 2010 18:57:23 +0000 (11:57 -0700)]
am
8e6f821e: Avoid inheriting PRIVATE_BOOTCLASSPATH from moduels that depend on api-stubs-timestamp
Merge commit '
8e6f821e733e075086cb80309717e3a85e2a9c37' into gingerbread-plus-aosp
* commit '
8e6f821e733e075086cb80309717e3a85e2a9c37':
Avoid inheriting PRIVATE_BOOTCLASSPATH from moduels that depend on api-stubs-timestamp
James Dong [Thu, 24 Jun 2010 18:55:40 +0000 (11:55 -0700)]
Merge "Use stagefright (instead of OpenCore) authoring engine by default -rebased" into gingerbread
Ying Wang [Thu, 24 Jun 2010 18:10:07 +0000 (11:10 -0700)]
Avoid inheriting PRIVATE_BOOTCLASSPATH from moduels that depend on api-stubs-timestamp
The inherited value has caused build breakage on Mac build.
Change-Id: I8a1b1d6c6d411f6aaaee2d8dbd0297e3d60ab5c2
James Dong [Thu, 24 Jun 2010 16:52:27 +0000 (09:52 -0700)]
Use stagefright (instead of OpenCore) authoring engine by default
-rebased
Change-Id: Ic184789eb4fb99b0e7cd5883bbe1267f903bc834
Andreas Huber [Thu, 24 Jun 2010 16:10:19 +0000 (09:10 -0700)]
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.
Andreas Huber [Thu, 24 Jun 2010 16:08:43 +0000 (09:08 -0700)]
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.
Andreas Huber [Thu, 24 Jun 2010 16:05:19 +0000 (09:05 -0700)]
Merge "Remove now unnecessary property overrides to opt into stagefright." into gingerbread
Ying Wang [Thu, 24 Jun 2010 04:30:04 +0000 (21:30 -0700)]
Ying Wang [Thu, 24 Jun 2010 04:28:50 +0000 (21:28 -0700)]
am
7b142da3: Fix javadoc for Java 6.
Merge commit '
7b142da3ce3849e56134666566df3f04f033c57d' into gingerbread-plus-aosp
* commit '
7b142da3ce3849e56134666566df3f04f033c57d':
Fix javadoc for Java 6.
Ying Wang [Thu, 24 Jun 2010 03:59:22 +0000 (20:59 -0700)]
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
Andreas Huber [Wed, 23 Jun 2010 23:39:45 +0000 (16:39 -0700)]
Remove now unnecessary property overrides to opt into stagefright.
Change-Id: I9810030e5576ac5a9cb31fcf0ce3f0baa96f6f40
related-to-bug:
2370115
Joe Onorato [Wed, 23 Jun 2010 23:04:38 +0000 (16:04 -0700)]
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.
Joe Onorato [Wed, 23 Jun 2010 23:02:49 +0000 (16:02 -0700)]
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.
Joe Onorato [Wed, 23 Jun 2010 21:03:13 +0000 (14:03 -0700)]
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
Jeff Hamilton [Wed, 23 Jun 2010 20:02:09 +0000 (13:02 -0700)]
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.
Jeff Hamilton [Wed, 23 Jun 2010 19:49:54 +0000 (12:49 -0700)]
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.
Dianne Hackborn [Wed, 23 Jun 2010 17:32:12 +0000 (10:32 -0700)]
am
a41921ed: am
f319c635: Add new "libandroid" to prelink map.
Merge commit '
a41921ed7e3cfccc40db3f8d2b1e4059b0715ebd'
* commit '
a41921ed7e3cfccc40db3f8d2b1e4059b0715ebd':
Add new "libandroid" to prelink map.
Doug Zongker [Wed, 23 Jun 2010 17:18:21 +0000 (10:18 -0700)]
am
c58e4f42: am
06acf91f: am
3b85269c: include build timestamp in OTA metadata
Merge commit '
c58e4f42ec27f81cd72d3e5872fd65e13a8e4213'
* commit '
c58e4f42ec27f81cd72d3e5872fd65e13a8e4213':
include build timestamp in OTA metadata
Jeff Hamilton [Mon, 21 Jun 2010 23:26:38 +0000 (18:26 -0500)]
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
Dianne Hackborn [Tue, 22 Jun 2010 18:24:18 +0000 (11:24 -0700)]
am
f319c635: Add new "libandroid" to prelink map.
Merge commit '
f319c635a85aca77b2f93f2a352295dba28c946b' into gingerbread-plus-aosp
* commit '
f319c635a85aca77b2f93f2a352295dba28c946b':
Add new "libandroid" to prelink map.
Dianne Hackborn [Sat, 19 Jun 2010 01:14:06 +0000 (18:14 -0700)]
Add new "libandroid" to prelink map.
Change-Id: I10bc30088fced39b2875bbbc19e33c53fa8352d7
Doug Zongker [Mon, 21 Jun 2010 22:43:25 +0000 (15:43 -0700)]
am
06acf91f: am
3b85269c: include build timestamp in OTA metadata
Merge commit '
06acf91f65015f8588f2621b89b8088b4664f9a3' into gingerbread-plus-aosp
* commit '
06acf91f65015f8588f2621b89b8088b4664f9a3':
include build timestamp in OTA metadata
Doug Zongker [Mon, 21 Jun 2010 22:40:21 +0000 (15:40 -0700)]
am
3b85269c: include build timestamp in OTA metadata
Merge commit '
3b85269cfe10ec15e9b544dd6964b8c9f5f761f9' into gingerbread
* commit '
3b85269cfe10ec15e9b544dd6964b8c9f5f761f9':
include build timestamp in OTA metadata
Doug Zongker [Mon, 21 Jun 2010 22:30:45 +0000 (15:30 -0700)]
include build timestamp in OTA metadata
Change-Id: I44292c6346db3356dfafbd044027e37a9b467cfe
Guang Zhu [Mon, 21 Jun 2010 20:00:53 +0000 (13:00 -0700)]
resolved conflicts for merge of
10b3f4b8 to master
Change-Id: I169c45161af01596c408cd3f3173d67cb541cb46
Guang Zhu [Mon, 21 Jun 2010 19:51:44 +0000 (12:51 -0700)]
am
4b137047: restore emma changes overwrittern by I9174f843
Merge commit '
4b137047210a1e64df1ebc0807d4eeeac7052c1e' into gingerbread-plus-aosp
* commit '
4b137047210a1e64df1ebc0807d4eeeac7052c1e':
restore emma changes overwrittern by I9174f843
Guang Zhu [Mon, 21 Jun 2010 19:34:51 +0000 (12:34 -0700)]
restore emma changes overwrittern by I9174f843
Change-Id: Ic5199ddfdaa2f8366bda960be84464945726e2f5
The Android Open Source Project [Mon, 21 Jun 2010 17:58:55 +0000 (10:58 -0700)]
The Android Open Source Project [Mon, 21 Jun 2010 17:57:21 +0000 (10:57 -0700)]
am
e1fef62b: (-s ours) merge from froyo-plus-aosp - DO NOT MERGE
Merge commit '
e1fef62bce230b9eb8a2a2c910d593f87e8173be'
* commit '
e1fef62bce230b9eb8a2a2c910d593f87e8173be':
Change branch name to openmaster, to avoid confusion
The Android Open Source Project [Mon, 21 Jun 2010 17:56:43 +0000 (10:56 -0700)]
merge from froyo-plus-aosp
Change-Id: I85cd0e3207b09b81e41f15d85cd1c900a6bb56b3
The Android Open Source Project [Mon, 21 Jun 2010 17:55:21 +0000 (10:55 -0700)]
merge from froyo-plus-aosp - DO NOT MERGE
Change-Id: I5ddea1d56218732cf5cba16e0c8db18399b7f504
Ying Wang [Mon, 21 Jun 2010 17:14:01 +0000 (10:14 -0700)]
resolved conflicts for merge of
34d37e50 to master
Change-Id: Ie7083ec2c87eb3fd28ea31002267f12ffe4426fa
Ying Wang [Mon, 21 Jun 2010 16:08:06 +0000 (09:08 -0700)]
am
45113a7f: am
06898660: A nothing-to-do build should do nothing.
Merge commit '
45113a7faa37747032be887ed12dd0e440524229' into gingerbread-plus-aosp
* commit '
45113a7faa37747032be887ed12dd0e440524229':
A nothing-to-do build should do nothing.
Ying Wang [Mon, 21 Jun 2010 16:06:12 +0000 (09:06 -0700)]
am
06898660: 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.
Ying Wang [Mon, 21 Jun 2010 15:47:44 +0000 (08:47 -0700)]
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.
Jack Palevich [Fri, 18 Jun 2010 22:06:07 +0000 (15:06 -0700)]
Merge "Add LOCAL_JNI_SHARED_LIBRARIES_ABI build variable."
The Android Open Source Project [Fri, 18 Jun 2010 20:49:35 +0000 (13:49 -0700)]
merge from open-source master
Change-Id: Ia4356e797e0c9bceec56a9a5cfeab3def5ae453c
Ying Wang [Fri, 18 Jun 2010 20:18:05 +0000 (13:18 -0700)]
Increase memory for Javadoc.
sdk builds continue breaking for out of memory..
Change-Id: Ie056241309f0303cdd4857cfb1421996811b1a8a
Jean-Baptiste Queru [Fri, 18 Jun 2010 15:10:44 +0000 (08:10 -0700)]
Change branch name to openmaster, to avoid confusion
Change-Id: Ibd0e460fd0f0c5d6fa4c1f858fbc280a0bcf7f1a
Jack Palevich [Fri, 18 Jun 2010 07:38:07 +0000 (15:38 +0800)]
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
Ying Wang [Fri, 18 Jun 2010 00:52:18 +0000 (17:52 -0700)]
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
Ying Wang [Thu, 17 Jun 2010 20:37:50 +0000 (13:37 -0700)]
Merge "extfs support for img_from_target_files"
Ying Wang [Wed, 16 Jun 2010 21:31:34 +0000 (14:31 -0700)]
extfs support for img_from_target_files
Change-Id: Ie3df70426066bff467792b8528bc4528eb6afe15
Jean-Baptiste Queru [Thu, 17 Jun 2010 17:05:54 +0000 (10:05 -0700)]
am
7aba65bb: merge from froyo-plus-aosp
Merge commit '
7aba65bb2b38ade61f5edd4d9f92c58953505ed1'
* commit '
7aba65bb2b38ade61f5edd4d9f92c58953505ed1':
Revert "Build BUILD_MULTI_PREBUILT for the prebuilt target"
Jean-Baptiste Queru [Thu, 17 Jun 2010 17:01:30 +0000 (10:01 -0700)]
merge from froyo-plus-aosp
Change-Id: Ica7f3076728f549ce94dd90584bdc24ee84ced15
The Android Open Source Project [Thu, 17 Jun 2010 16:58:22 +0000 (09:58 -0700)]
merge from open-source master
Change-Id: I55d36474223c79e6ab5000b2cb09b01762eb3823
Jean-Baptiste Queru [Thu, 17 Jun 2010 16:27:59 +0000 (09:27 -0700)]
Revert "Build BUILD_MULTI_PREBUILT for the prebuilt target"
This reverts commit
9bfd697cffae4b4f2bdbf122c3bbe7920525e718,
which was causing all prebuilts to be installed in all builds.
Change-Id: Ia5973b31d23bd74ec187b9e44715dea56c063efe
Jing Yu [Thu, 17 Jun 2010 03:47:01 +0000 (20:47 -0700)]
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
Jing Yu [Thu, 17 Jun 2010 03:44:14 +0000 (20:44 -0700)]
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
Jing Yu [Thu, 17 Jun 2010 03:17:19 +0000 (20:17 -0700)]
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
David 'Digit' Turner [Thu, 17 Jun 2010 02:41:44 +0000 (19:41 -0700)]
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.
David 'Digit' Turner [Thu, 17 Jun 2010 00:02:44 +0000 (17:02 -0700)]
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.
Ying Wang [Wed, 16 Jun 2010 23:56:03 +0000 (16:56 -0700)]
Merge "Move definition of build-userimage-ext-target to build/"
David 'Digit' Turner [Wed, 16 Jun 2010 23:04:55 +0000 (16:04 -0700)]
Remove irritating warnings about 'va_list' mangling when building C++ sources.
Change-Id: I6305e93515e57462e7c57af0cc41a659e4190696
Guang Zhu [Wed, 16 Jun 2010 22:28:20 +0000 (15:28 -0700)]
am
4873beb5: am
a943634a: Merge "improvement for emma filter option" into gingerbread
Merge commit '
4873beb5b018d74a3b38403f34628ed6c3435888'
* commit '
4873beb5b018d74a3b38403f34628ed6c3435888':
improvement for emma filter option
Guang Zhu [Wed, 16 Jun 2010 22:26:41 +0000 (15:26 -0700)]
am
a943634a: Merge "improvement for emma filter option" into gingerbread
Merge commit '
a943634afaf64ad2188fc8ecfb54daed40350be2' into gingerbread-plus-aosp
* commit '
a943634afaf64ad2188fc8ecfb54daed40350be2':
improvement for emma filter option
Guang Zhu [Wed, 16 Jun 2010 22:25:19 +0000 (15:25 -0700)]
Merge "improvement for emma filter option" into gingerbread
Ying Wang [Wed, 16 Jun 2010 21:58:50 +0000 (14:58 -0700)]
Move definition of build-userimage-ext-target to build/
Change-Id: I313dc26e8c497797c3321627e13ae298b1e37723
Ying Wang [Tue, 15 Jun 2010 22:43:13 +0000 (15:43 -0700)]
resolved conflicts for merge of
56791ebe to master
Change-Id: I7463636796f1262fd92af839102dc58d562259f7
Ying Wang [Tue, 15 Jun 2010 22:17:42 +0000 (15:17 -0700)]
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.
Ying Wang [Tue, 15 Jun 2010 22:11:51 +0000 (15:11 -0700)]
resolved conflicts for merge of
2b8d2383 to gingerbread
Change-Id: I9174f843f0fde139a7d582f45b027f3face5c981
Joe Onorato [Tue, 15 Jun 2010 21:29:19 +0000 (17:29 -0400)]
Require a directory that could actually exist.
Change-Id: I6030a062dc9f6a40ea32ecbb612c2b9353fc1af6
Joe Onorato [Tue, 15 Jun 2010 21:24:42 +0000 (14:24 -0700)]
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.
Joe Onorato [Tue, 15 Jun 2010 20:59:01 +0000 (13:59 -0700)]
Merge changes I02214abd,I79e6f60e into froyo
* changes:
Add a tapas command.
Rename is_unbundled_app_build and UNBUNDLED_APP_BUILD to TARGET_BUILD_APPS.
Guang Zhu [Tue, 15 Jun 2010 20:31:25 +0000 (13:31 -0700)]
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
The Android Open Source Project [Mon, 14 Jun 2010 18:22:20 +0000 (11:22 -0700)]
am
9f431335: merge from froyo-plus-aosp
Merge commit '
9f431335ab377396713b8b386ad7539b2b28eff5'
* commit '
9f431335ab377396713b8b386ad7539b2b28eff5':
generic.mk: Replaced AlarmClock with newer DeskClock App
The Android Open Source Project [Mon, 14 Jun 2010 18:21:00 +0000 (11:21 -0700)]
merge from froyo-plus-aosp
Change-Id: Ie8f2b137de580bfb23a1bdee513a8a20075e40a3
Eric Laurent [Mon, 14 Jun 2010 16:40:05 +0000 (09:40 -0700)]
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.
Eric Laurent [Mon, 14 Jun 2010 16:38:16 +0000 (09:38 -0700)]
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.
Eric Laurent [Mon, 14 Jun 2010 16:37:15 +0000 (09:37 -0700)]
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.
Eric Laurent [Mon, 14 Jun 2010 16:35:24 +0000 (09:35 -0700)]
Merge "Added prelinked library for audio effects JNI." into kraken
The Android Open Source Project [Mon, 14 Jun 2010 16:03:32 +0000 (09:03 -0700)]
merge from open-source master
Change-Id: I058f809f7e7eb69a757cb75f934a3630dfd7d777
Raphael [Sat, 12 Jun 2010 18:36:14 +0000 (11:36 -0700)]
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
Jean-Baptiste Queru [Fri, 11 Jun 2010 22:45:15 +0000 (15:45 -0700)]
Merge "generic.mk: Replaced AlarmClock with newer DeskClock App"
Ed Heyl [Fri, 11 Jun 2010 22:30:54 +0000 (15:30 -0700)]
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"
Ed Heyl [Fri, 11 Jun 2010 22:29:06 +0000 (15:29 -0700)]
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"
Ed Heyl [Fri, 11 Jun 2010 22:27:29 +0000 (15:27 -0700)]
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"
Ed Heyl [Fri, 11 Jun 2010 22:22:42 +0000 (15:22 -0700)]
Revert "Merge "Switch the required host Java environment to 1.6." into kraken"
This reverts commit
1f29d2c376295cb7ba909ae2beb4904099546e89, reversing
changes made to
f9f513ab3386e0ab61cb072170b4b65f0d124732.
Sriram Raman [Fri, 11 Jun 2010 19:34:09 +0000 (12:34 -0700)]
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.
Sriram Raman [Fri, 11 Jun 2010 19:30:53 +0000 (12:30 -0700)]
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.
Sriram Raman [Fri, 11 Jun 2010 19:28:12 +0000 (12:28 -0700)]
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.
Sriram Raman [Fri, 11 Jun 2010 19:24:53 +0000 (12:24 -0700)]
Merge "Switch the required host Java environment to 1.6." into kraken
Ying Wang [Fri, 11 Jun 2010 16:12:12 +0000 (09:12 -0700)]
am
df249af6: am
74a9fd08: am
a07d37b7: Cherry-pick bug fixes from
Merge commit '
df249af6b6bd137b7a27623905f3e94a31104eef'
* commit '
df249af6b6bd137b7a27623905f3e94a31104eef':
Cherry-pick bug fixes from master.
Ying Wang [Fri, 11 Jun 2010 16:08:57 +0000 (09:08 -0700)]
am
74a9fd08: am
a07d37b7: Cherry-pick bug fixes from
Merge commit '
74a9fd08731f78516a6c0e81169c8e8ff7a6d9c1' into gingerbread-plus-aosp
* commit '
74a9fd08731f78516a6c0e81169c8e8ff7a6d9c1':
Cherry-pick bug fixes from master.
Ying Wang [Fri, 11 Jun 2010 16:05:05 +0000 (09:05 -0700)]
am
a07d37b7: Cherry-pick bug fixes from master.
Merge commit '
a07d37b79300e76da5f21f532578fcd686a74b16' into froyo-plus-aosp
* commit '
a07d37b79300e76da5f21f532578fcd686a74b16':
Cherry-pick bug fixes from master.