OSDN Git Service
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
Jean-Baptiste Queru [Fri, 14 May 2010 22:47:56 +0000 (15:47 -0700)]
Merge "Use a different kernel boot line for the disk installer."
Jean-Baptiste Queru [Fri, 14 May 2010 22:47:39 +0000 (15:47 -0700)]
Merge "Use a property to enable the eth0 LAN port on the emulator"
The Android Open Source Project [Fri, 14 May 2010 21:35:29 +0000 (14:35 -0700)]
merge from open-source master
Change-Id: I4ea9aa2765cb634382da92ff17f5af9e2f6b4078
Jean-Baptiste Queru [Fri, 14 May 2010 21:10:50 +0000 (14:10 -0700)]
Merge "Fix "make modules" script bug under Mac OS X."
The Android Open Source Project [Fri, 14 May 2010 20:38:55 +0000 (13:38 -0700)]
merge from open-source master
Change-Id: Ia4cb27645bfd757fb75273ff5a6cbf3af57b3a03
Jean-Baptiste Queru [Fri, 14 May 2010 19:21:31 +0000 (12:21 -0700)]
Merge "Updated to better distinguish between options and operands"
Jean-Baptiste Queru [Fri, 14 May 2010 19:17:43 +0000 (12:17 -0700)]
Merge "Support absolute path, in OUT_DIR"
Ravi K Yenduri [Sun, 14 Feb 2010 22:15:32 +0000 (16:15 -0600)]
Build BUILD_MULTI_PREBUILT for the prebuilt target
Add files included as prebuilts with "BUILD_MULTI_PREBUILT"
to be installed as part of the 'prebuilt' target.
Change-Id: I2fa2dfff2637701281ab78a523c58fc46577ab75
The Android Open Source Project [Mon, 10 May 2010 18:05:12 +0000 (11:05 -0700)]
merge from open-source master
Change-Id: Id99b6cbc613c6c7b9d1ef79274b1c28b808a32d4
Scott Main [Mon, 10 May 2010 17:26:20 +0000 (10:26 -0700)]
am
3494d9b3: docs: lighten the "new" red. softens the effect and makes it more legible when selected
Merge commit '
3494d9b3deeb9967be247bf31cdaa3fd30fb4207' into froyo-plus-aosp
* commit '
3494d9b3deeb9967be247bf31cdaa3fd30fb4207':
docs: lighten the "new" red. softens the effect and makes it more legible when selected
Scott Main [Mon, 10 May 2010 15:18:26 +0000 (08:18 -0700)]
docs: lighten the "new" red. softens the effect and makes it more legible when selected
Change-Id: I0f1f70c281cc0a6f3621c898b04d3845924f6e35
Scott Main [Mon, 10 May 2010 16:43:15 +0000 (09:43 -0700)]
am
3044d243: Merge "add froyo graphic for homepage and fix css bug" into froyo
Merge commit '
3044d243c99f46030521fce650add82db640046a' into froyo-plus-aosp
* commit '
3044d243c99f46030521fce650add82db640046a':
add froyo graphic for homepage and fix css bug
Jean-Baptiste Queru [Fri, 7 May 2010 19:53:45 +0000 (12:53 -0700)]
Merge "Replace arm with proper variable for CPU/ABI"
Bruce Beare [Fri, 7 May 2010 18:51:30 +0000 (11:51 -0700)]
Use a different kernel boot line for the disk installer.
Change-Id: I6b20386a24e1141bfe2a252b635243c235d46865
Scott Main [Fri, 7 May 2010 18:32:12 +0000 (11:32 -0700)]
Merge "add froyo graphic for homepage and fix css bug" into froyo
Dan Bornstein [Thu, 6 May 2010 23:12:06 +0000 (16:12 -0700)]
am
03fb96f0: Allow for a slightly larger libwebcore, add another library to the list, correct/update a couple entries, and add a couple more comments.
Merge commit '
03fb96f01eeed12ce5dc6dd8fa2e839ed497758e' into froyo-plus-aosp
* commit '
03fb96f01eeed12ce5dc6dd8fa2e839ed497758e':
Allow for a slightly larger libwebcore, add another library to the list,
Dan Bornstein [Thu, 6 May 2010 02:33:47 +0000 (19:33 -0700)]
Allow for a slightly larger libwebcore, add another library to the list,
correct/update a couple entries, and add a couple more comments.
Bug:
2651381
Change-Id: I9aaf48c3c2115b111794710bb4e959613bf22add
Scott Main [Thu, 6 May 2010 18:43:08 +0000 (11:43 -0700)]
add froyo graphic for homepage and fix css bug
Change-Id: Ie040686a6c7982233d72298403a88f794b6b26db
The Android Open Source Project [Wed, 5 May 2010 22:16:56 +0000 (15:16 -0700)]
merge from open-source master
Change-Id: Ie06ab3b2424480706c644f1a803a6e3de400f15d
Dan Bornstein [Wed, 5 May 2010 21:37:24 +0000 (14:37 -0700)]
am
3ca0e96a: Merge "Fixed a bunch of stuff in the prelink mappings file:" into froyo
Merge commit '
3ca0e96a3a66a6c53536bf7346f616e672e2c57a' into froyo-plus-aosp
* commit '
3ca0e96a3a66a6c53536bf7346f616e672e2c57a':
Fixed a bunch of stuff in the prelink mappings file:
Dan Bornstein [Wed, 5 May 2010 21:36:04 +0000 (14:36 -0700)]
Merge "Fixed a bunch of stuff in the prelink mappings file:" into froyo
Bruce Beare [Wed, 5 May 2010 16:47:16 +0000 (09:47 -0700)]
Replace arm with proper variable for CPU/ABI
Change-Id: If8594d9a2abf4d8c08b5ccea612bb700afa9e9b7
Bruce Beare [Tue, 4 May 2010 21:49:38 +0000 (14:49 -0700)]
Use a property to enable the eth0 LAN port on the emulator
Change-Id: I26f4ec7fac9b7a8ad3013914967cf0f8fdec91ff
Bruce Beare [Fri, 30 Apr 2010 19:48:32 +0000 (12:48 -0700)]
Add support for x86 VirtualBox Emulation
To make a VirtualBox install image,
make installer_img
Dan Bornstein [Mon, 3 May 2010 22:15:57 +0000 (15:15 -0700)]
Fixed a bunch of stuff in the prelink mappings file:
* Added mappings for most of the libraries that didn't already
have them (as observed from my build).
* Re-canonicalized all the offsets in the mappings file,
per the official policy of keeping things megabyte-aligned.
* Added comments on each line indicating what size the library
actually appeared to be in my build (to help with future rejiggerings).
* Added a bit of documentation about the whole deal.
Even with this change, I know there are other libraries that will
still need to be included, but I think what I have here is a good
step. Also, this change only reserves room for the new libraries, but
subsequent changes (in other subprojects) are required to actually
start prelinking the new libraries. Those changes will be forthcoming
as well.
Bug:
2651381
Change-Id: I7a06382fc2b8a14bbd3261de58df3f8a31e4108e
Scott Main [Wed, 5 May 2010 01:18:02 +0000 (18:18 -0700)]
am
74108dea: fix css bug for paragraphs in table cells - only select the direct descendant for p:last-child in a td
Merge commit '
74108deaf1747943a493751cbff9de321f1dd397' into froyo-plus-aosp
* commit '
74108deaf1747943a493751cbff9de321f1dd397':
fix css bug for paragraphs in table cells
Scott Main [Wed, 5 May 2010 00:24:26 +0000 (17:24 -0700)]
fix css bug for paragraphs in table cells
- only select the direct descendant for p:last-child in a td
Change-Id: I9ad63b80914fbfe4d3e74041915f67b7a08d9649
The Android Open Source Project [Mon, 3 May 2010 23:11:04 +0000 (16:11 -0700)]
merge from open-source master
Change-Id: I3d24628d38c99369f242733d9089d7c5669a4623
Jean-Baptiste Queru [Mon, 3 May 2010 16:52:03 +0000 (09:52 -0700)]
Adapt to new location of libcore
Change-Id: I316355751db621d318a78dc6e844d6bf2c7fdc87
Doug Zongker [Fri, 30 Apr 2010 21:24:34 +0000 (14:24 -0700)]
am
2ea21065: add metadata to OTA package in easily-parsed form
Merge commit '
2ea21065b66da9819df92b37a79f0f87552ee331' into froyo-plus-aosp
* commit '
2ea21065b66da9819df92b37a79f0f87552ee331':
add metadata to OTA package in easily-parsed form
Jean-Baptiste Queru [Fri, 30 Apr 2010 17:13:33 +0000 (10:13 -0700)]
Adapt to new location of libcore
Change-Id: Ibabfe907f00522c1966ddc333352eaea2bdcb5bd
Alexey Tarasov [Sat, 21 Nov 2009 03:41:06 +0000 (13:41 +1000)]
Make expr more POSIXy
Change-Id: I939cf1f227c14112656804d69c1afd7ead4a31ed
Jean-Baptiste Queru [Thu, 29 Apr 2010 14:16:36 +0000 (07:16 -0700)]
Merge "generic_x86 support"
Bruce Beare [Wed, 28 Apr 2010 21:12:52 +0000 (14:12 -0700)]
generic_x86 support
Add in Makefiles and support files for x86 builds
Based on changes by: wonjong.lee <wonjong.lee@windriver.com>
Additional changes by: Mark Gross <mark.gross@intel.com>
Additional changes by: Bruce Beare <brucex.j.beare@intel.com>
Change-Id: Id087411b282b1b68a0251e7f9cbbdde183549787
Signed-off-by: Bruce Beare <brucex.j.beare@intel.com>
Evan JIANG [Fri, 23 Jan 2009 16:11:30 +0000 (00:11 +0800)]
Fix "make modules" script bug under Mac OS X.
For Mac OS uses BSD sed, it doesn't support "\n". Then, "make modules"
command cannot work correctly under Mac OS. Using tr command to replace
sed command, it has the same behavior under both Mac OS and Linux.
Change-Id: I29e044cc66bf24f6459cbb33164fd9f55f772e3c
Doug Zongker [Wed, 28 Apr 2010 23:05:21 +0000 (16:05 -0700)]
add metadata to OTA package in easily-parsed form
This is only for use by the tools that manipulate OTA packages; it
doesn't touch device code.
Change-Id: I1e21b24b86340d8f86c9d15b2aeb79c461f75d18
The Android Open Source Project [Wed, 28 Apr 2010 22:55:08 +0000 (15:55 -0700)]
merge from open-source master
Change-Id: Ie49d1b19914fcfefedfdfc070800426d4b13dd46
Raphael Moll [Sun, 18 Apr 2010 07:07:37 +0000 (00:07 -0700)]
Remove obsolete machine-setup.html reference.
Bug 1231
Change-Id: I629361cf5dddc9d0fbf493e016f1aaf2a50b6935
Scott Main [Tue, 27 Apr 2010 21:28:12 +0000 (14:28 -0700)]
am
c3d808a7: Merge "support a few more header levels for sidebox so the sidebox can be placed at any level and be semantically correct" into froyo
Merge commit '
c3d808a727c2b42d48658e6fca06b1d4a9817f12' into froyo-plus-aosp
* commit '
c3d808a727c2b42d48658e6fca06b1d4a9817f12':
support a few more header levels for sidebox so the sidebox can
Scott Main [Tue, 27 Apr 2010 21:23:04 +0000 (14:23 -0700)]
Merge "support a few more header levels for sidebox so the sidebox can be placed at any level and be semantically correct" into froyo
Raphael [Sat, 24 Apr 2010 00:15:13 +0000 (17:15 -0700)]
am
9ca1628e: Support building Windows SDK under Linux.
Merge commit '
9ca1628e3f565607e1fdef71b570d3ddb5ec09df' into froyo-plus-aosp
* commit '
9ca1628e3f565607e1fdef71b570d3ddb5ec09df':
Support building Windows SDK under Linux.
Raphael [Sat, 24 Apr 2010 00:14:58 +0000 (17:14 -0700)]
am
4c70244c: Make zipalign build for the Win SDK under Linux.
Merge commit '
4c70244cb1af8b2babd7750c2bd19aeb722e19e0' into froyo-plus-aosp
* commit '
4c70244cb1af8b2babd7750c2bd19aeb722e19e0':
Make zipalign build for the Win SDK under Linux.
Raphael [Sat, 17 Apr 2010 00:50:09 +0000 (17:50 -0700)]
Support building Windows SDK under Linux.
- envsetup.mk & config.mk: we define a new BUILD_OS and a minimal set
of things like BUILD_OUT to be able to use some local tools when
doing cross-compilation. This allows us to use the Linux version of
ACP when cross-compiling the tools to Windows.
- Makfile: include windows_sdk.mk when needed to build a Windows SDK.
- main.mk: support a win_sdk target (e.g. PRODUCT-sdk-win_sdk)
(Merge master Change I9d08d0df)
Raphael [Wed, 14 Apr 2010 19:19:12 +0000 (12:19 -0700)]
Make zipalign build for the Win SDK under Linux.
(Merge master Change Ibd667437)
Scott Main [Fri, 23 Apr 2010 18:41:30 +0000 (11:41 -0700)]
support a few more header levels for sidebox so the sidebox can
be placed at any level and be semantically correct
Change-Id: I51b77e82a701e1898986698d3a58a1b8367ec5c6
Scott Main [Wed, 21 Apr 2010 00:33:03 +0000 (17:33 -0700)]
am
d72731d2: docs: misc css changes make sidebox size match qv make figure align with right margin remove margins from the last <p> in a table cell
Merge commit '
d72731d213269f63f2bb80631f02914800f556ad' into froyo-plus-aosp
* commit '
d72731d213269f63f2bb80631f02914800f556ad':
docs: misc css changes
Scott Main [Tue, 20 Apr 2010 22:38:17 +0000 (15:38 -0700)]
am
f655dab5: Merge "docs: add script to capture the ctrl+f key event (initiates \'find\' search on the page) and expand all inherited members." into froyo
Merge commit '
f655dab5e611d8e013f1e5ad4ddcb269f7db05a6' into froyo-plus-aosp
* commit '
f655dab5e611d8e013f1e5ad4ddcb269f7db05a6':
docs: add script to capture the ctrl+f key event (initiates 'find' search
Scott Main [Thu, 15 Apr 2010 23:34:41 +0000 (16:34 -0700)]
docs: misc css changes
make sidebox size match qv
make figure align with right margin
remove margins from the last <p> in a table cell
Change-Id: Ie655dac45728f782fb309f3c11c1b7ee56bc5660
Scott Main [Tue, 20 Apr 2010 22:34:22 +0000 (15:34 -0700)]
Merge "docs: add script to capture the ctrl+f key event (initiates 'find' search on the page) and expand all inherited members." into froyo
Roman Nurik [Mon, 19 Apr 2010 23:30:12 +0000 (16:30 -0700)]