OSDN Git Service
Bruce Beare [Thu, 14 Oct 2010 19:21:58 +0000 (12:21 -0700)]
Display the TARGET_ARCH_VARIANT
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Bill Napier [Sun, 10 Oct 2010 19:06:13 +0000 (12:06 -0700)]
Add in MonkeyRunner target (and dependent libs) to SDK build.
Change-Id: I396635324cf9d2e590513228f5de5cea9df4dfd3
Jean-Baptiste Queru [Thu, 7 Oct 2010 21:16:35 +0000 (14:16 -0700)]
Merge "Explicitly request ip-up-vpn"
Xavier Ducrohet [Mon, 27 Sep 2010 22:51:32 +0000 (15:51 -0700)]
Use the new sdk/build/tools.atree.
As the sdk.git project is branched differently from the rest
of the platform, it's important to be able to control what
goes in the tools folder of the SDK on a per-branch basis.
Right now development/build/sdk.atree control what goes in
the tools folder (coming almost only from sdk.git) which causes
problems when the development.git and sdk.git branches are not
in sync.
Change-Id: Ia0b0ea37f8a4904b3a7f7805a552eeb499a2c0ee
Jean-Baptiste Queru [Sun, 26 Sep 2010 17:07:09 +0000 (10:07 -0700)]
Explicitly request ip-up-vpn
Change-Id: I05c1a3f75e9a2b9040fda3e00f0b659c613968b1
Ying Wang [Thu, 8 Jul 2010 01:12:25 +0000 (18:12 -0700)]
Enforce 64-bit build environment
We will only support 64-bit build environment beyond froyo/2.2 .
Change-Id: I71eb1230bf0bc12ccde2aeda6255db6a87540437
Gary King [Tue, 9 Mar 2010 01:16:57 +0000 (17:16 -0800)]
[build] move dumpvar.mk include after select.mk include
because the dumpvar target was included early in envsetup.mk, it was
not possible to use it to dump variables that were defined by makefiles
included later (like the toolchain variables in combo/select.mk).
move dumpvar.mk to after select.mk and javac.mk, so that shell functions
can be created using the toolchain build variables
Change-Id: I1c22025a8981fa91c183846fb28be26fb562adfb
Signed-off-by: Gary King <gking@nvidia.com>
Jean-Baptiste Queru [Thu, 9 Sep 2010 21:07:21 +0000 (14:07 -0700)]
Merge "Add atom optimization flags"
Ying Wang [Thu, 2 Sep 2010 16:44:39 +0000 (09:44 -0700)]
Merge "Disable new longjmp in glibc 2.11 and later."
Ying Wang [Wed, 1 Sep 2010 23:56:25 +0000 (16:56 -0700)]
Disable new longjmp in glibc 2.11 and later.
Bug:
2967937
Change-Id: I7a5ef082502192f41c26a48632edfe775dea7648
Jean-Baptiste Queru [Wed, 1 Sep 2010 13:10:40 +0000 (06:10 -0700)]
Revert "Fixed problem with keymap files copied to target"
This reverts commit
c90449f2a88ceb44db5333b5442fc00fa4d0e4dd.
Jean-Baptiste Queru [Tue, 31 Aug 2010 21:52:54 +0000 (14:52 -0700)]
Merge "Fixed problem with keymap files copied to target"
Ying Wang [Wed, 25 Aug 2010 01:33:22 +0000 (18:33 -0700)]
Link against Mac OSX 10.5 SDK if building on 10.6.
So that tools built on Snow Leopard (10.6) can be used on Leopard (10.5).
Change-Id: I99745ecbe2ad11feaae31d5be31c34c2e0ad7cc5
Magnus Karlsson [Mon, 30 Aug 2010 14:51:28 +0000 (16:51 +0200)]
Fixed problem with keymap files copied to target
Moved Android.mk and keymap files except AVRCP.kl from sdk/emulator/keymaps
to build/target/board/generic. This causes the keymap files to copied into
the system image of generic and sdk products, but not into the system image
of HW products. Originally the qwerty.kl was copied to target no matter
if the target had a qwerty keyboard or not, which is the case for e.g.
the Nexus One.
Change-Id: I7cd80497632fb3b9e7ce2f3a7888d4924a355f52
Raphael Moll [Sat, 28 Aug 2010 22:03:40 +0000 (15:03 -0700)]
SDK: add hierarchyviewer2 to windows target list.
Change-Id: I282173ab10930a716861f3774804d3d8484a71f3
Thorsten Glaser [Thu, 3 Jun 2010 17:58:02 +0000 (19:58 +0200)]
For the generic board, set /system/bin/sh to mksh to test the transition
Change-Id: I778bae4060dd404e82fbf9dd5b8a2024c8268402
Thorsten Glaser [Thu, 3 Jun 2010 17:57:02 +0000 (19:57 +0200)]
Add new variable TARGET_SHELL := ash (default; or mksh)
Besides that, add enough magic to build everything tagged
as "shell_$(TARGET_SHELL)" and permit ash/mksh as not unusual
Change-Id: I36c0590ba49f45251d24dc179cb27c8368c3662a
Raphael Moll [Mon, 16 Aug 2010 18:12:53 +0000 (11:12 -0700)]
Add easymock for list of Windows SDK targets.
Also correctly sorted the windows sdk target list.
Change-Id: I4742a0b98ece8e0693a6f346a1f09595253d65c1
Jean-Baptiste Queru [Mon, 16 Aug 2010 15:08:48 +0000 (08:08 -0700)]
Merge "add drm/ directory to include it as part of frameworks"
Xavier Ducrohet [Wed, 28 Jul 2010 18:07:31 +0000 (11:07 -0700)]
Package ddmlib-prebuilt with CTS.
This ensures that CTS is using a compatible ddmlib.
Change-Id: Iff6d2bfec873949dfd07ccf758bf257350f11298
aimitakeshi [Mon, 26 Jul 2010 23:34:47 +0000 (08:34 +0900)]
add drm/ directory to include it as part of frameworks
Change-Id: I62a6ab77587d88ea960f9ece17dcb75726e7e5a9
Chih-Wei Huang [Mon, 26 Jul 2010 02:41:38 +0000 (10:41 +0800)]
Add atom optimization flags
To enable the optimization, set TARGET_ARCH_VARIANT := x86-atom.
Change-Id: I6b7798944bb8262bd83a76712419d8a77d3c34e9
Jean-Baptiste Queru [Fri, 23 Jul 2010 18:25:51 +0000 (11:25 -0700)]
Merge "Replaced AlarmClock with DeskClock"
Christian Mehlmauer [Fri, 23 Jul 2010 18:09:54 +0000 (20:09 +0200)]
Replaced AlarmClock with DeskClock
Change-Id: I1a9b9ce79b5b16709fe2d89638285633801b6d24
Jeffrey Chyan [Wed, 7 Jul 2010 18:42:19 +0000 (13:42 -0500)]
Allow explicit warnings for projects
Enabled compiler warnings by default and then modified javac
command to include warnings only if a project's warning flag,
LOCAL_WARNINGS_ENABLE, is set to true.
Change-Id: I5111d16a862f3afaaf1dcba2f2c2b7fc072613f1
Jean-Baptiste Queru [Thu, 15 Jul 2010 21:04:39 +0000 (14:04 -0700)]
Add full_x86 product.
By inheriting from full, this will be more self-maintaining, and
automatically gets a better-configured variant (e.g. it has locales,
a date format, etc...).
Change-Id: I67b6c2d9f9b7d20cb89154906c3f3d6a5391c838
Jean-Baptiste Queru [Mon, 12 Jul 2010 20:58:59 +0000 (13:58 -0700)]
Merge "Move buildspec vars to BoardConfig.mk"
Bruce Beare [Mon, 12 Jul 2010 17:12:44 +0000 (10:12 -0700)]
Add generic_x86-eng to the lunch menu
Change-Id: Ie4e0f9054c5bc6ad8845b5b885a00174dd8c9534
Signed-off-by: Bruce Beare <brucex.j.beare@intel.com>
Bruce Beare [Thu, 8 Jul 2010 21:59:16 +0000 (14:59 -0700)]
Define __ANDROID__ for x86 to be on par with ARM build requirements
Change-Id: I79c8f29af1f20b694f22a39f848216022809a5c6
Signed-off-by: Bruce Beare <brucex.j.beare@intel.com>
Bruce Beare [Mon, 12 Jul 2010 18:32:37 +0000 (11:32 -0700)]
Move buildspec vars to BoardConfig.mk
Change-Id: I48ed4b55e91aae51076d9c609b44bf9fa24c3ecd
Signed-off-by: Bruce Beare <brucex.j.beare@intel.com>
Jean-Baptiste Queru [Mon, 12 Jul 2010 18:18:31 +0000 (11:18 -0700)]
Merge "Vendorsetup needs to look in additional places."
Bruce Beare [Thu, 24 Jun 2010 20:51:35 +0000 (13:51 -0700)]
Vendorsetup needs to look in additional places.
Change-Id: I698856f8e02487322540e804c038bba28cc23532
Signed-off-by: Bruce Beare <brucex.j.beare@intel.com>
Bruce Beare [Mon, 12 Jul 2010 14:53:28 +0000 (07:53 -0700)]
Allow TARGET_ARCH to be set from BoardConfig.mk
Change-Id: I66aed78b763d238719822257c1f4f35301247df6
Signed-off-by: Bruce Beare <brucex.j.beare@intel.com>
Jean-Baptiste Queru [Fri, 9 Jul 2010 20:25:41 +0000 (13:25 -0700)]
Fix build - USE_MINGW seems to be the preferred define
Change-Id: I57dd7f5029ed1fe3a74be7573a28fa894187b3a7
Jean-Baptiste Queru [Fri, 9 Jul 2010 19:49:19 +0000 (12:49 -0700)]
Merge "acp: Ensure dst mtime always greater or equal to src mtime"
Bruce Beare [Thu, 24 Jun 2010 21:02:00 +0000 (14:02 -0700)]
Refactor Stripper. Allow a stripper other than SOSLIM to be specified
Change-Id: I61137f5bb123dc5f610af9928ed3debdf85ba74d
Signed-off-by: Bruce Beare <brucex.j.beare@intel.com>
Jean-Baptiste Queru [Fri, 9 Jul 2010 17:44:37 +0000 (10:44 -0700)]
Merge "Set arm specific variables to be empty for non-arm platforms"
Chih-Wei Huang [Fri, 9 Jul 2010 02:07:52 +0000 (10:07 +0800)]
Set arm specific variables to be empty for non-arm platforms
These variables are useless for non-arm platforms, and will
generate misleading messages during building process.
Change-Id: I37c46ac8d30f353333803d9591b65fca24ce3fd5
Kan-Ru Chen [Mon, 5 Jul 2010 09:04:37 +0000 (17:04 +0800)]
acp: Ensure dst mtime always greater or equal to src mtime
When copying files from file systems that support high resolution
mtime, we should not truncating the nsec part. Instead we should
increase the dst mtime by one sec to prevent dst mtime to become less
than src mtime.
Change-Id: I2b4200c72c4e6ee8aae875b5e64701324799afc7
Jean-Baptiste Queru [Thu, 8 Jul 2010 23:36:54 +0000 (16:36 -0700)]
Merge "Create systemtarball either with bz2 or gz"
Bruce Beare [Fri, 11 Jun 2010 19:05:57 +0000 (12:05 -0700)]
Create systemtarball either with bz2 or gz
Change-Id: I64e93872942e8dcad4a894a906be7912bb6da308
Signed-off-by: Bruce Beare <brucex.j.beare@intel.com>
Chris Peterson [Sat, 26 Jun 2010 00:31:30 +0000 (17:31 -0700)]
update 404'd source.android.com URLs
Change-Id: If305c7f6f3ac3624568de258bdc13b142ad32cf9
Jean-Baptiste Queru [Thu, 8 Jul 2010 20:19:51 +0000 (13:19 -0700)]
Merge "Create boottarball just like systemtarball"
Bruce Beare [Fri, 4 Jun 2010 22:24:49 +0000 (15:24 -0700)]
Create boottarball just like systemtarball
Change-Id: I97640bc973ab1d115499878a63bff48f80b326ec
Signed-off-by: Bruce Beare <brucex.j.beare@intel.com>
Bruce Beare [Tue, 29 Jun 2010 22:50:29 +0000 (15:50 -0700)]
Update to latest (froyo) init.rc
Change-Id: Ibbf5427261dbb84cdc28c6de931e65c8cac547a6
Signed-off-by: Bruce Beare <brucex.j.beare@intel.com>
Jean-Baptiste Queru [Thu, 8 Jul 2010 18:02:14 +0000 (11:02 -0700)]
Merge "Explicitly indicates that only bash is supported."
Jean-Baptiste Queru [Thu, 8 Jul 2010 17:15:03 +0000 (10:15 -0700)]
Revert "acp: Ensure dst mtime always greater or equal to src mtime"
This reverts commit
a67bc11058f47eeba1f8bb30173c73ec0af8fcce.
Change-Id: Iba646152e62d61f0e4e64541748e7821a7dd3a9c
Jean-Baptiste Queru [Thu, 8 Jul 2010 16:47:08 +0000 (09:47 -0700)]
Merge "acp: Ensure dst mtime always greater or equal to src mtime"
Kan-Ru Chen [Mon, 5 Jul 2010 07:53:47 +0000 (15:53 +0800)]
Explicitly indicates that only bash is supported.
Remove all zsh compatibility code and related comments.
Display a warning when other shell is used, to prevent the illusion
that building under Zsh is supported when it's not.
Change-Id: Ie6d43ace3a30bde99aad45b00d25007ac28d5155
Chih-Wei Huang [Mon, 31 Aug 2009 06:55:33 +0000 (14:55 +0800)]
Add $(TARGET_DEVICE_DIR)/system.prop to be a prerequisite
If $(TARGET_DEVICE_DIR)/system.prop exists, it should be
a prerequisite of $(INSTALLED_BUILD_PROP_TARGET),
as the following rules state.
Change-Id: Ie395b6f08cef198c3f5c733a5b6ae5a458335a9c
Kan-Ru Chen [Mon, 5 Jul 2010 09:04:37 +0000 (17:04 +0800)]
acp: Ensure dst mtime always greater or equal to src mtime
When copying files from file systems that support high resolution
mtime, we should not truncating the nsec part. Instead we should
increase the dst mtime by one sec to prevent dst mtime to become less
than src mtime.
Change-Id: I5cab1edd4b9783ec0e3ceb04ed833d8bbba00b19
Jean-Baptiste Queru [Thu, 1 Jul 2010 16:22:53 +0000 (09:22 -0700)]
Add full-eng instead of generic-eng in the lunch menu
Change-Id: I3f779087021ef3674ee9ceb8cc3b15f83a98b8f4
Raphael Moll [Tue, 29 Jun 2010 00:38:09 +0000 (17:38 -0700)]
Fix to "make ddmlib ddmuilib" under Windows/Cygwin.
Needed by the latest change to sdk.git/eclipse/script/create_ddms*.sh
Change-Id: I6dfbb418cc8813c7cdfbc077705158424220724f
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 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
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
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
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
The Android Open Source Project [Mon, 28 Jun 2010 17:35:50 +0000 (10:35 -0700)]
merge from open-source master
Change-Id: I90d465b0197034dab76505b8a68afc519be3e6e0
Jean-Baptiste Queru [Mon, 28 Jun 2010 16:40:24 +0000 (09:40 -0700)]
Update platform version strings for AOSP
Change-Id: I47d405646dd2f5179bd0db0a0b360bf5ba0069c1
Scott Main [Fri, 25 Jun 2010 01:11:52 +0000 (18:11 -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 froyo-plus-aosp
* 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:00:46 +0000 (18:00 -0700)]
am
c048c9b5: default empty tapas to TARGET_BUILD_APPS "all"
Merge commit '
c048c9b598b36dc7506a954cc0d3d80f308b1b13' into froyo-plus-aosp
* 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
Doug Zongker [Mon, 21 Jun 2010 22:42:14 +0000 (15:42 -0700)]
am
3b85269c: include build timestamp in OTA metadata
Merge commit '
3b85269cfe10ec15e9b544dd6964b8c9f5f761f9' into froyo-plus-aosp
* 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
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.
The Android Open Source Project [Fri, 18 Jun 2010 20:49:35 +0000 (13:49 -0700)]
merge from open-source master
Change-Id: Ia4356e797e0c9bceec56a9a5cfeab3def5ae453c
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
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 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
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.
The Android Open Source Project [Mon, 14 Jun 2010 16:03:32 +0000 (09:03 -0700)]
merge from open-source master
Change-Id: I058f809f7e7eb69a757cb75f934a3630dfd7d777
Jean-Baptiste Queru [Fri, 11 Jun 2010 22:45:15 +0000 (15:45 -0700)]
Merge "generic.mk: Replaced AlarmClock with newer DeskClock App"
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.
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
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
Ying Wang [Wed, 9 Jun 2010 18:33:36 +0000 (11:33 -0700)]
am
7a794289: Merge "Unbundle the build system." into froyo
Merge commit '
7a7942899eedde3b946768a155fac3d70af5c9c3' into froyo-plus-aosp
* commit '
7a7942899eedde3b946768a155fac3d70af5c9c3':
Unbundle the build system.
Ying Wang [Wed, 9 Jun 2010 18:31:29 +0000 (11:31 -0700)]
Merge "Unbundle the build system." into froyo
Ying Wang [Wed, 9 Jun 2010 17:26:26 +0000 (10:26 -0700)]
Unbundle the build system.
Change-Id: I88912d876c3972212e8871b3e5b3b8b6d2da34d0
Jeff Hamilton [Tue, 8 Jun 2010 21:05:12 +0000 (14:05 -0700)]
am
04be0d86: Set JAVA_HOME to point to java 1.5.
Merge commit '
04be0d869acce82293b6c668f52bddf14c106908' into froyo-plus-aosp
* commit '
04be0d869acce82293b6c668f52bddf14c106908':
Set JAVA_HOME to point to java 1.5.
Jeff Hamilton [Mon, 7 Jun 2010 20:03:54 +0000 (15:03 -0500)]
Set JAVA_HOME to point to java 1.5.
Change-Id: I1304b78b17cd13a2231c59385a94e0430a8198ff
The Android Open Source Project [Tue, 8 Jun 2010 20:14:16 +0000 (13:14 -0700)]
merge from open-source master
Change-Id: I2169fb30a5bfe48501745b2141e82ad9e25971aa
Jean-Baptiste Queru [Tue, 8 Jun 2010 17:06:47 +0000 (10:06 -0700)]
Merge "Build BUILD_MULTI_PREBUILT for the prebuilt target"
The Android Open Source Project [Fri, 4 Jun 2010 14:56:24 +0000 (07:56 -0700)]
merge from open-source master
Change-Id: Id3161ac44e0eaba0184b3d2d4af43e4e40d26e90
Jeff Hamilton [Wed, 26 May 2010 23:13:54 +0000 (18:13 -0500)]
Build host tools as 32bit on all Darwin machines.
Change-Id: I121b388056e68b787518c66a01c172bc4ffaef9b
Ying Wang [Wed, 2 Jun 2010 21:37:28 +0000 (14:37 -0700)]
am
ba16a89d: Override LOCAL_CERTIFICATE in inherit-package.
Merge commit '
ba16a89dbd61003a3b907d0f5e8fc48fba2afcab' into froyo-plus-aosp
* commit '
ba16a89dbd61003a3b907d0f5e8fc48fba2afcab':
Override LOCAL_CERTIFICATE in inherit-package.
Ying Wang [Wed, 2 Jun 2010 20:24:36 +0000 (13:24 -0700)]
Override LOCAL_CERTIFICATE in inherit-package.
it's to fix typo.
Change-Id: I9a791faa4b7b5967b5d23bfcb4caeebaef94e723
Ying Wang [Wed, 2 Jun 2010 20:09:12 +0000 (13:09 -0700)]
am
52911309: Cherry-pick unbundled build changes from master
Merge commit '
529113098350c026ec521258d4c6fba51f285a48' into froyo-plus-aosp
* commit '
529113098350c026ec521258d4c6fba51f285a48':
Cherry-pick unbundled build changes from master
Ying Wang [Wed, 26 May 2010 20:13:56 +0000 (13:13 -0700)]
Cherry-pick unbundled build changes from master
Change-Id: I82cab32f00b7b729d9b01c8e1532c8bf0ad2fb92
Xavier Ducrohet [Wed, 26 May 2010 00:49:24 +0000 (17:49 -0700)]
am
8e5605a7: Add QuickSearchBox to the SDK build.
Merge commit '
8e5605a774fd2f61c6d5bae0440b20fc0bdd79f7' into froyo-plus-aosp
* commit '
8e5605a774fd2f61c6d5bae0440b20fc0bdd79f7':
Add QuickSearchBox to the SDK build.
Xavier Ducrohet [Wed, 26 May 2010 00:03:07 +0000 (17:03 -0700)]
Add QuickSearchBox to the SDK build.
Change-Id: Ia0cc7b4cd8245d368685d50cf32cd21875cbdbbf
Scott Main [Tue, 25 May 2010 19:31:29 +0000 (12:31 -0700)]
am
ca671ab7: Revert "Doc change: Update froyo mark for home"
Merge commit '
ca671ab7a661625e021f2145e2d01f39d542fb28' into froyo-plus-aosp
* commit '
ca671ab7a661625e021f2145e2d01f39d542fb28':
Revert "Doc change: Update froyo mark for home"
Scott Main [Tue, 25 May 2010 19:22:29 +0000 (12:22 -0700)]
Revert "Doc change: Update froyo mark for home"
This reverts commit
9d1d6441d97eeea80c70c549646d7c177936e148.
Christian Mehlmauer [Sat, 22 May 2010 20:22:26 +0000 (22:22 +0200)]
generic.mk: Replaced AlarmClock with newer DeskClock App
Change-Id: I2afe4876b1dd7e9e9200e27ba64eebe4a34065fb
Dirk Dougherty [Thu, 20 May 2010 07:15:38 +0000 (00:15 -0700)]
am
e9b01eb4: Doc change: add tv assets for carousel.
Merge commit '
e9b01eb46d461e7cfecb365acf046e2ad56c05a0' into froyo-plus-aosp
* commit '
e9b01eb46d461e7cfecb365acf046e2ad56c05a0':
Doc change: add tv assets for carousel.
Dirk Dougherty [Wed, 19 May 2010 05:12:23 +0000 (22:12 -0700)]
Doc change: add tv assets for carousel.
Change-Id: I357509c83e64ceb898b2069482ff1d0f3b3337cc
Dirk Dougherty [Thu, 20 May 2010 01:58:05 +0000 (18:58 -0700)]
am
9d1d6441: Doc change: Update froyo mark for home
Merge commit '
9d1d6441d97eeea80c70c549646d7c177936e148' into froyo-plus-aosp
* commit '
9d1d6441d97eeea80c70c549646d7c177936e148':
Doc change: Update froyo mark for home
Dirk Dougherty [Thu, 20 May 2010 01:25:33 +0000 (18:25 -0700)]
Doc change: Update froyo mark for home
Change-Id: Idacecd87faca95cd258436ab842c03102e5fc6c6
The Android Open Source Project [Fri, 14 May 2010 22:52:40 +0000 (15:52 -0700)]
merge from open-source master
Change-Id: I0dd123dde8f0da42a99313cffed6a48d30e38381