OSDN Git Service
The Android Automerger [Thu, 8 Jul 2010 23:20:24 +0000 (16:20 -0700)]
GRG08B
Change-Id: Ib033283a7cca90160750ec8a6b1f20ba48e22cdb
The Android Automerger [Thu, 8 Jul 2010 23:20:12 +0000 (16:20 -0700)]
Merge branch 'gingerbread' into gingerbread-release
Scott Main [Thu, 8 Jul 2010 18:42:13 +0000 (11:42 -0700)]
am
b66a5c05: docs: modify redirect link text
Merge commit '
b66a5c0574e14b838d9dc2497540ffc6cb73dc4f' into gingerbread
* commit '
b66a5c0574e14b838d9dc2497540ffc6cb73dc4f':
docs: modify redirect link text
Scott Main [Thu, 8 Jul 2010 18:29:28 +0000 (11:29 -0700)]
docs: modify redirect link text
Change-Id: Ieb26c4278958624b9c7aa8795cd7a8cab87fafec
The Android Automerger [Thu, 8 Jul 2010 15:17:05 +0000 (08:17 -0700)]
GRG08
Change-Id: Ieff66aa54f46aaed7094029d04ae4e93e6602a74
The Android Automerger [Thu, 8 Jul 2010 15:16:51 +0000 (08:16 -0700)]
Merge branch 'gingerbread' into gingerbread-release
Steve Howard [Wed, 7 Jul 2010 21:07:24 +0000 (14:07 -0700)]
Fix broken interaction of JarJar and Emma.
JarJar, like DX, can't handle the local var corruption that Emma
performs. To fix this, I'm moving the JarJar step before the Emma
step.
Couple other minor changes:
* Improved the comment about emma hardcoding its output filename,
since this took me about an hour to track down.
* Changed one line from "Copying $<" to "Copying $@". It seems to be
the convention that such lines print the destination, not the
source, so I made it consistent.
Change-Id: I9f5c36b4f5af15daf15025b89860e942f15bb668
David Turner [Wed, 7 Jul 2010 21:14:19 +0000 (14:14 -0700)]
Merge "Clean up warnings in soslim" into gingerbread
The Android Automerger [Wed, 7 Jul 2010 15:21:14 +0000 (08:21 -0700)]
GRG07
Change-Id: I139ab17d7e3a812f57c6cbc2bfd1a03673d6170e
The Android Automerger [Tue, 6 Jul 2010 15:10:34 +0000 (08:10 -0700)]
GRG06
Change-Id: I3af337f53801388f7eef30c3516c61de96a92617
The Android Automerger [Tue, 6 Jul 2010 15:08:29 +0000 (08:08 -0700)]
Merge branch 'gingerbread' into gingerbread-release
The Android Automerger [Fri, 2 Jul 2010 15:38:05 +0000 (08:38 -0700)]
GRG02
Change-Id: I6017bbc4fc47a649f7b58bc45dcebe2e82a31f6d
android-build SharedAccount [Fri, 2 Jul 2010 15:34:56 +0000 (08:34 -0700)]
resolve conflicts in build_id.mk
Change-Id: I06a86ec9e2c22b8f948d3dd8041081373d222131
Steve Howard [Mon, 3 May 2010 22:01:38 +0000 (15:01 -0700)]
Manual merge of change 50994 from master (DO NOT MERGE)
Merging from master because I'm bringing my maps API work into
gingerbread.
Fix and enable JarJar in Java builds.
java.mk contained a target to enable JarJar in Java builds, but it was
being bypassed. This change enabled JarJar as part of the build
process, and fixes a slight bug with the way it was set up.
Change-Id: I814e64eb30b41bf249a63d683c03040e2658fe0d
Ed Heyl [Thu, 1 Jul 2010 17:23:20 +0000 (10:23 -0700)]
Add ramdisk.img to the dist dir, again (was removed at some point) - from master - please do no merge
b/
2590492 and requested again
Change-Id: I1f4efac2a8ca47f1b69761bb9233427e0ca0411d
Ying Wang [Wed, 30 Jun 2010 23:34:52 +0000 (16:34 -0700)]
am
783f449b: Don\'t copy apns-conf.xml for apps-only build
Merge commit '
783f449bdc0fe8aa9f2385c22bb0831fa3d5d1c9' into gingerbread
* commit '
783f449bdc0fe8aa9f2385c22bb0831fa3d5d1c9':
Don't copy apns-conf.xml for apps-only build
Ying Wang [Wed, 30 Jun 2010 22:21:27 +0000 (15:21 -0700)]
Don't copy apns-conf.xml for apps-only build
http://b/issue?id=
2796939
This can fix commands mm and mmm in an unbundled branch.
The cause is that mm & mmm depends on phony target "files", which includes apns-conf.xml.
Change-Id: I72ce1c7c5ddfdcd3bbea5cb9645ca3a48ff8ac12
Jean-Baptiste Queru [Wed, 30 Jun 2010 15:58:32 +0000 (08:58 -0700)]
Merge "Change branch name to gingerbread, to match reality - DO NOT MERGE" into gingerbread
The Android Automerger [Wed, 30 Jun 2010 15:22:10 +0000 (08:22 -0700)]
GRF91
Change-Id: Ib5661481431a8353adfa34ec5ee78223cd1cc576
The Android Automerger [Wed, 30 Jun 2010 15:21:39 +0000 (08:21 -0700)]
Merge branch 'gingerbread' into gingerbread-release
The Android Open Source Project [Tue, 29 Jun 2010 21:34:16 +0000 (14:34 -0700)]
set up fast-forward from froyo-release to gingerbread
Change-Id: I91ef2a183f34b54405580498a3cab39ec6dc7f24
Ying Wang [Tue, 29 Jun 2010 16:28:56 +0000 (09:28 -0700)]
am
0af605f3: Merge "Allow to override --version-code and --version-name in LOCAL_AAPT_FLAGS" into froyo
Merge commit '
0af605f3b6e759f480a5124dc6b338ec58e1d40c' into gingerbread
* commit '
0af605f3b6e759f480a5124dc6b338ec58e1d40c':
Allow to override --version-code and --version-name in LOCAL_AAPT_FLAGS
Ying Wang [Tue, 29 Jun 2010 16:18:00 +0000 (09:18 -0700)]
Merge "Allow to override --version-code and --version-name in LOCAL_AAPT_FLAGS" into froyo
The Android Automerger [Tue, 29 Jun 2010 15:17:15 +0000 (08:17 -0700)]
GRF90
Change-Id: I1a3d96f86e688e1f280bdcd6bb9059df0526b30a
The Android Automerger [Mon, 28 Jun 2010 15:18:58 +0000 (08:18 -0700)]
GRF89
Change-Id: I38695a2b2072dcbe5cb479bc0a06de40de04c415
The Android Automerger [Mon, 28 Jun 2010 15:16:42 +0000 (08:16 -0700)]
Merge branch 'gingerbread' into gingerbread-release
Kenny Root [Sun, 27 Jun 2010 05:39:38 +0000 (22:39 -0700)]
Clean up warnings in soslim
Change-Id: I497745fe9701876272fdbe7a946622a40efffdd5
David 'Digit' Turner [Fri, 25 Jun 2010 17:42:42 +0000 (10:42 -0700)]
Merge "Enable shared libraries to use crtbegin_so.S and crtend_so.S" into gingerbread
The Android Automerger [Fri, 25 Jun 2010 15:16:08 +0000 (08:16 -0700)]
GRF86
Change-Id: Icbc8dace89da08920a9d6d585899e01663858c7f
The Android Automerger [Fri, 25 Jun 2010 15:15:53 +0000 (08:15 -0700)]
Merge branch 'gingerbread' into gingerbread-release
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 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
android-build SharedAccount [Thu, 24 Jun 2010 23:06:16 +0000 (16:06 -0700)]
frf85B
Change-Id: I012a38642e8f0685d9811ec1a4dcb6e3d59d19bd
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 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
android-build SharedAccount [Thu, 24 Jun 2010 19:28:31 +0000 (12:28 -0700)]
frf85
Change-Id: Ib1a8aa2cd4e652a46f70c54540afc2ea87724779
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:05:19 +0000 (09:05 -0700)]
Merge "Remove now unnecessary property overrides to opt into stagefright." into gingerbread
The Android Automerger [Thu, 24 Jun 2010 15:15:40 +0000 (08:15 -0700)]
GRF85
Change-Id: I3301c5fe3e45f63ffdd16a4dbaedea040ab5a9c2
The Android Automerger [Thu, 24 Jun 2010 15:15:08 +0000 (08:15 -0700)]
Merge branch 'gingerbread' into gingerbread-release
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
android-build SharedAccount [Wed, 23 Jun 2010 22:44:01 +0000 (15:44 -0700)]
frf84B
Change-Id: I44d0d9d2e9bec68089b1e2d4dee5bd74a847ead1
android-build SharedAccount [Wed, 23 Jun 2010 22:37:41 +0000 (15:37 -0700)]
frf84
Change-Id: Icb9eb9a74294965302cb7bc5ebddb4939953487d
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
Ying Wang [Wed, 23 Jun 2010 20:34:22 +0000 (13:34 -0700)]
Allow to override --version-code and --version-name in LOCAL_AAPT_FLAGS
Change-Id: Ibbcd626e6856d9340d9d3e2f916127feed0b6f5c
The Android Automerger [Wed, 23 Jun 2010 15:46:24 +0000 (08:46 -0700)]
GRF84
Change-Id: I6fb4f4c296cd51ac6a06cf6830a274ee491cbb40
The Android Automerger [Wed, 23 Jun 2010 15:46:05 +0000 (08:46 -0700)]
Merge branch 'gingerbread' into gingerbread-release
android-build SharedAccount [Tue, 22 Jun 2010 22:49:50 +0000 (15:49 -0700)]
frf83
Change-Id: I25c7ad6d743d7d9a2e13f9eb9b5cede50b4ad249
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
The Android Automerger [Tue, 22 Jun 2010 15:14:42 +0000 (08:14 -0700)]
GRF83
Change-Id: I76d8f806015cec704dc53d7362e0decbc783aafc
The Android Automerger [Tue, 22 Jun 2010 15:14:14 +0000 (08:14 -0700)]
Merge branch 'gingerbread' into gingerbread-release
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: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
android-build SharedAccount [Mon, 21 Jun 2010 22:27:11 +0000 (15:27 -0700)]
frf82
Change-Id: Ic8aa76257e743e9923eb03591f64202a624a80ec
Guang Zhu [Mon, 21 Jun 2010 19:34:51 +0000 (12:34 -0700)]
restore emma changes overwrittern by I9174f843
Change-Id: Ic5199ddfdaa2f8366bda960be84464945726e2f5
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.
The Android Automerger [Mon, 21 Jun 2010 15:45:42 +0000 (08:45 -0700)]
GRF82
Change-Id: I3da577ee1878c987981b622f38b2a93b6f05fb72
David 'Digit' Turner [Fri, 18 Jun 2010 22:05:01 +0000 (15:05 -0700)]
Enable shared libraries to use crtbegin_so.S and crtend_so.S
This is necessary to ensure that dlclose() will properly call C++
destructors for the static objects within the shared library.
Change-Id: Ieb056042f9cda7ab120eb770b21f365cd6d64a66
The Android Automerger [Fri, 18 Jun 2010 15:17:16 +0000 (08:17 -0700)]
GRF79
Change-Id: I4f97904cfad3690a3501294a50bd40af615ee0af
Jean-Baptiste Queru [Fri, 18 Jun 2010 15:08:14 +0000 (08:08 -0700)]
Change branch name to gingerbread, to match reality - DO NOT MERGE
Bug:
2780717
Change-Id: I448fa9c164ab3732c52d1f195493ed86be0a1b08
android-build SharedAccount [Fri, 18 Jun 2010 02:39:07 +0000 (19:39 -0700)]
Merge branch 'froyo' of ssh://android-git.corp.google.com:29418/platform/build into froyo-release
android-build SharedAccount [Fri, 18 Jun 2010 02:21:02 +0000 (19:21 -0700)]
FRF78
Change-Id: I8469df6db72297c26fd84774e0ce6959e42309c3
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
The Android Automerger [Thu, 17 Jun 2010 16:00:49 +0000 (09:00 -0700)]
GRF78
Change-Id: I13b812538d112c23360f2106a8afb3d2590a4156
The Android Automerger [Thu, 17 Jun 2010 15:54:06 +0000 (08:54 -0700)]
Merge branch 'gingerbread' into gingerbread-release
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
android-build SharedAccount [Thu, 17 Jun 2010 01:10:52 +0000 (18:10 -0700)]
FRF77B
Change-Id: I90c887745e7a34169f2fd4799e047c7c51b287cb
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:25:19 +0000 (15:25 -0700)]
Merge "improvement for emma filter option" into gingerbread
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 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 Automerger [Mon, 14 Jun 2010 21:00:49 +0000 (14:00 -0700)]
FRF75
Change-Id: Icb295f833bad1dd3fb6299e6dc1c68b6706830d8
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
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: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
The Android Automerger [Fri, 11 Jun 2010 18:47:22 +0000 (11:47 -0700)]
FRF72
Change-Id: Idc0551b59e3339ab1162bfa0f2f813cd7cf168f1
The Android Automerger [Fri, 11 Jun 2010 18:47:08 +0000 (11:47 -0700)]
Merge branch 'froyo' into froyo-release
Ying Wang [Fri, 11 Jun 2010 16:04:43 +0000 (09:04 -0700)]
am
a07d37b7: Cherry-pick bug fixes from master.
Merge commit '
a07d37b79300e76da5f21f532578fcd686a74b16' into gingerbread
* commit '
a07d37b79300e76da5f21f532578fcd686a74b16':
Cherry-pick bug fixes from master.
The Android Automerger [Fri, 11 Jun 2010 09:45:52 +0000 (02:45 -0700)]
GRF72
Change-Id: I017ba340cff2f619ab0e1cd548170662a9a81ea1
The Android Automerger [Fri, 11 Jun 2010 09:45:22 +0000 (02:45 -0700)]
Merge branch 'gingerbread' into gingerbread-release
Ed Heyl [Fri, 11 Jun 2010 09:06:03 +0000 (02:06 -0700)]
kraken --> gingerbread
Change-Id: I7710134ec026b9c494fe2912809607c162b5ac51
android-build SharedAccount [Fri, 11 Jun 2010 08:16:41 +0000 (01:16 -0700)]
fix build id
Change-Id: I1bc4b8c9b5db8285309fa2d68fda80bc47f03533
Joe Onorato [Thu, 10 Jun 2010 01:18:31 +0000 (18:18 -0700)]
Add a tapas command.
(Actually there was a tapas command that just called choosecombo).
The new better tapas command is for building unbundled apps. Run
it with one or more modules to build and optionally a build variant.
tapas [variant] App1 App2 ...
If you don't supply a build variant, it defaults to eng.
Change-Id: I02214abd0b5ad02e364fcb024e10cf6ad17a9e68
Joe Onorato [Wed, 9 Jun 2010 23:35:58 +0000 (16:35 -0700)]
Rename is_unbundled_app_build and UNBUNDLED_APP_BUILD to TARGET_BUILD_APPS.
Change-Id: I79e6f60e009dad3a48709962347441e4ca0c337a
The Android Automerger [Thu, 10 Jun 2010 23:19:36 +0000 (16:19 -0700)]
FRF71
Change-Id: I54eda0b63a3ec32b48bbab80c29d3ead8462a3a0
The Android Automerger [Thu, 10 Jun 2010 23:19:15 +0000 (16:19 -0700)]
Merge branch 'froyo' into froyo-release
Jeff Hamilton [Wed, 9 Jun 2010 22:40:36 +0000 (15:40 -0700)]
Merge "Make the Java version check non-fatal to aid in the switch to 1.6 on the build servers." into kraken
Jeff Hamilton [Wed, 9 Jun 2010 02:17:17 +0000 (21:17 -0500)]
Switch the required host Java environment to 1.6.
Change-Id: Ic289e35a747b6f462816aca159acba6d400829c9
Jeff Hamilton [Wed, 9 Jun 2010 21:56:39 +0000 (16:56 -0500)]
Make the Java version check non-fatal to aid in the switch to 1.6 on the build servers.
Change-Id: Ieb0779ef54cdfa921a8dbfb1041536f8969d22e4
Ying Wang [Wed, 9 Jun 2010 18:43:33 +0000 (11:43 -0700)]
Cherry-pick bug fixes from master.
1. Set correct aidl_preprocess_import for LOCAL_SDK_VERSION current.
2. Set correct PRIVATE_BOOTCLASSPATH for non-empty LOCAL_SDK_VERSION.
Change-Id: Iff8e266931434863521bfa4621767bed31d31cc0