OSDN Git Service
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
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.
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
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 [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
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
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.
Ed Heyl [Fri, 11 Jun 2010 09:06:03 +0000 (02:06 -0700)]
kraken --> gingerbread
Change-Id: I7710134ec026b9c494fe2912809607c162b5ac51
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
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
Ying Wang [Wed, 9 Jun 2010 18:33:32 +0000 (11:33 -0700)]
am
7a794289: Merge "Unbundle the build system." into froyo
Merge commit '
7a7942899eedde3b946768a155fac3d70af5c9c3' into kraken
* 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
Eric Laurent [Wed, 9 Jun 2010 13:51:12 +0000 (06:51 -0700)]
Added prelinked library for audio effects JNI.
Change-Id: Ic3d26cedbff599c3ee6fed080b64fce5375ea940
Jeff Hamilton [Tue, 8 Jun 2010 21:04:28 +0000 (14:04 -0700)]
am
04be0d86: Set JAVA_HOME to point to java 1.5.
Merge commit '
04be0d869acce82293b6c668f52bddf14c106908' into kraken
* 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 [Fri, 4 Jun 2010 16:53:20 +0000 (09:53 -0700)]
am
4873d8f5: (-s ours) merge from open-source master
Merge commit '
4873d8f5ca9fecc9c826ad383befbefb3407296b' into kraken
* commit '
4873d8f5ca9fecc9c826ad383befbefb3407296b':
Build host tools as 32bit on all Darwin machines.
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
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
Joe Onorato [Thu, 29 Apr 2010 02:58:28 +0000 (19:58 -0700)]
Add SystemUI.apk to the generic build.
Change-Id: I03d92d93fbcb51808a096fb7d48c1b693efa777d
Ying Wang [Wed, 2 Jun 2010 21:38:43 +0000 (14:38 -0700)]
am
e8ffa149: am
ba16a89d: Override LOCAL_CERTIFICATE in inherit-package.
Merge commit '
e8ffa1490023eff03335b550c582eaadd3a4561b' into kraken
* commit '
e8ffa1490023eff03335b550c582eaadd3a4561b':
Override LOCAL_CERTIFICATE in inherit-package.
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.
Andy McFadden [Wed, 2 Jun 2010 20:46:11 +0000 (13:46 -0700)]
Merge "Atomic/SMP update." into kraken
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:11:32 +0000 (13:11 -0700)]
am
b93e03cb: am
52911309: Cherry-pick unbundled build changes from master
Merge commit '
b93e03cbc9d47a9d9a385c780ed64639e2a23ae5' into kraken
* commit '
b93e03cbc9d47a9d9a385c780ed64639e2a23ae5':
Cherry-pick unbundled build changes from master
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
Andy McFadden [Thu, 20 May 2010 22:29:53 +0000 (15:29 -0700)]
Atomic/SMP update.
Added "TARGET_CPU_SMP := true" to simulator configuration, since it's
likely the simulator will be running on SMP hardware.
Change-Id: I7527895abe70ffaece5c52fd3ffcfe4b0d698fd2
Joe Onorato [Fri, 21 May 2010 21:29:29 +0000 (14:29 -0700)]
Make make ECLIPSE-lunch build a .classpath for all the java stuff that will be included in the
build.
Change-Id: I5a6066fa2afc9cb7bea794770bbb589615a1f9eb
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:50:43 +0000 (17:50 -0700)]
am
0c5363c8: am
8e5605a7: Add QuickSearchBox to the SDK build.
Merge commit '
0c5363c8571eef11eeb21a575da941565c34191e' into kraken
* commit '
0c5363c8571eef11eeb21a575da941565c34191e':
Add QuickSearchBox to the SDK build.
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
Andreas Huber [Tue, 25 May 2010 20:57:29 +0000 (13:57 -0700)]
Merge "Make Vorbis decoding through stagefright the default." into kraken
Scott Main [Tue, 25 May 2010 19:33:03 +0000 (12:33 -0700)]
am
b7ebe01f: am
ca671ab7: Revert "Doc change: Update froyo mark for home"
Merge commit '
b7ebe01f6049bbb93e7473cdd86b857cb9e18e5f' into kraken
* commit '
b7ebe01f6049bbb93e7473cdd86b857cb9e18e5f':
Revert "Doc change: Update froyo mark for home"
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"
Andreas Huber [Tue, 25 May 2010 19:27:03 +0000 (12:27 -0700)]
Make Vorbis decoding through stagefright the default.
Change-Id: I4273b766024f5363fdd05c3d30d0c71209679950
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.
Eric Laurent [Tue, 25 May 2010 06:23:05 +0000 (23:23 -0700)]
Merge "Fix issue
2667796 [Audio Effect Framework] Effect factory and libraries." into kraken
Chih-Chung Chang [Mon, 24 May 2010 04:03:37 +0000 (21:03 -0700)]
Merge "Set no camera default for emulator/generic/sim builds." into kraken
Eric Laurent [Fri, 21 May 2010 13:02:07 +0000 (06:02 -0700)]
Fix issue
2667796 [Audio Effect Framework] Effect factory and libraries.
Added prelink map entry for libeffects.so. This library contains the
effect factory needed to load plugin effect libraries.
Also remove obsolete entry for libaudiopolicygeneric.so library.
Change-Id: I65db56eec2c1ff1b50c6da0572492138d3e00607
Dirk Dougherty [Thu, 20 May 2010 07:17:09 +0000 (00:17 -0700)]
am
d44754e0: am
e9b01eb4: Doc change: add tv assets for carousel.
Merge commit '
d44754e0e5e11c33c0ede3eb7e168a301e59a3cf' into kraken
* commit '
d44754e0e5e11c33c0ede3eb7e168a301e59a3cf':
Doc change: add tv assets for carousel.
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:59:53 +0000 (18:59 -0700)]
am
e5cfdbfb: am
9d1d6441: Doc change: Update froyo mark for home
Merge commit '
e5cfdbfb17b3915b86d8a5eacee0bf1391504795' into kraken
* commit '
e5cfdbfb17b3915b86d8a5eacee0bf1391504795':
Doc change: Update froyo mark for home
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
Guang Zhu [Thu, 13 May 2010 23:46:21 +0000 (16:46 -0700)]
Squashed commit of the following (DO NOT MERGE):
commit
7401608f3b9b52b3348e32ec9fefe7583d6c2fa4
Author: Guang Zhu <guangzhu@google.com>
Date: Fri Apr 23 11:54:37 2010 -0700
collect emm meta files for emma instrumented build
when doing 'make dist', with EMMA_INSTRUMENT on the coverage.em files
generated for each module will be collected into one emma_meta.zip file
Change-Id: I382c39a97005e6cae5c79ad7eaef1c8857f658af
commit
8376d70938f6507d54b66fe5832a637aa883974e
Author: Guang Zhu <guangzhu@google.com>
Date: Wed Mar 10 15:48:03 2010 -0800
enhancement for building app with emma code coverage
* global filter to avoid applying instrumentation on emma classes
* remove local variable information at dex step instead of compile time
Change-Id: If04c27bc717f34816077a98ead9ceb0dbcbb0d2f
Change-Id: I971bd0f291bede2568b21347247d37a7d035c661
Ying Wang [Tue, 18 May 2010 02:07:21 +0000 (19:07 -0700)]
Fix typo.
Change-Id: I6eb60e7b89bd331deaa46e2c3f746aa2b042e1b4
Joe Onorato [Tue, 18 May 2010 01:40:39 +0000 (18:40 -0700)]
fix typo
Change-Id: Ic00f82ea7bbe570ef30f52b353ba147664d755d7
Joe Onorato [Tue, 18 May 2010 01:16:11 +0000 (18:16 -0700)]
Add a rule that builds an eclipse project file for an app.
Type make ECLIPSE-<app1>-<app2>... with the apps as listed in LOCAL_PACKAGE_NAME.
Change-Id: Ieb96dfc9dfc13bdf1b3be53572092fc7bc695869
Nick Kralevich [Fri, 14 May 2010 16:34:59 +0000 (09:34 -0700)]
Add -Werror=format-security
Security hardening: don't allow code to compile which
uses format strings in an inappropriate way. Make format
string compiler warnings into errors.
Change-Id: I1461dad589a2416420fd84ccf765983e859eea8a
The Android Open Source Project [Fri, 14 May 2010 22:54:09 +0000 (15:54 -0700)]
am
bc12cd04: merge from open-source master
Merge commit '
bc12cd04b878a9c3520abd21600c2078c930adc3' into kraken
* commit '
bc12cd04b878a9c3520abd21600c2078c930adc3':
Use a different kernel boot line for the disk installer.
Use a property to enable the eth0 LAN port on the emulator
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:37:17 +0000 (14:37 -0700)]
am
95f862bc: merge from open-source master
Merge commit '
95f862bcb0418fd931c574157a5c90312ea2fb77' into kraken
* commit '
95f862bcb0418fd931c574157a5c90312ea2fb77':
Fix "make modules" script bug under Mac OS X.
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:43:29 +0000 (13:43 -0700)]
am
9514fca5: merge from open-source master
Merge commit '
9514fca5c78c85b6f5e2d2497b05bbea2613daa8' into kraken
* commit '
9514fca5c78c85b6f5e2d2497b05bbea2613daa8':
Support absolute path, in OUT_DIR
Updated to better distinguish between options and operands
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"
Nick Kralevich [Thu, 13 May 2010 19:14:12 +0000 (12:14 -0700)]
libdrm2 is never used. Remove the reference to it.
Change-Id: Iee14e336377cedb56adb71bc4f40ded137906f1f
The Android Open Source Project [Mon, 10 May 2010 18:11:09 +0000 (11:11 -0700)]
am
f7c63421: merge from open-source master
Merge commit '
f7c634216e673407f5a7a879bcf2ddb2454e4670' into kraken
* commit '
f7c634216e673407f5a7a879bcf2ddb2454e4670':
Replace arm with proper variable for CPU/ABI
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:28:29 +0000 (10:28 -0700)]
am
de14ee57: am
3494d9b3: docs: lighten the "new" red. softens the effect and makes it more legible when selected
Merge commit '
de14ee570176dbae4b0c6f098088d3872669175d' into kraken
* commit '
de14ee570176dbae4b0c6f098088d3872669175d':
docs: lighten the "new" red. softens the effect and makes it more legible when selected
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:49:59 +0000 (09:49 -0700)]
am
9096ef38: am
3044d243: Merge "add froyo graphic for homepage and fix css bug" into froyo
Merge commit '
9096ef382a5c17f4a6618dd19ac203840d807e0a' into kraken
* commit '
9096ef382a5c17f4a6618dd19ac203840d807e0a':
add froyo graphic for homepage and fix css bug
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
Chih-Chung Chang [Mon, 10 May 2010 06:59:49 +0000 (14:59 +0800)]
Set no camera default for emulator/generic/sim builds.
Change-Id: I3c75d093bb48a9d10952d587c3e48bbcc227f139
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:31:01 +0000 (16:31 -0700)]
am
6e079d7e: 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 '
6e079d7e3d30cd8985fc5d1e34c871cdf2ec5068' into kraken
* commit '
6e079d7e3d30cd8985fc5d1e34c871cdf2ec5068':
Allow for a slightly larger libwebcore, add another library to the list,
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:20:00 +0000 (15:20 -0700)]
am
f9e275b0: merge from open-source master
Merge commit '
f9e275b0c785aa8ed83606e5b98f37d2050a528e' into kraken
* commit '
f9e275b0c785aa8ed83606e5b98f37d2050a528e':
Add support for x86 VirtualBox Emulation
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:39:24 +0000 (14:39 -0700)]
am
aed937ba: am
3ca0e96a: Merge "Fixed a bunch of stuff in the prelink mappings file:" into froyo
Merge commit '
aed937ba46e4137ad5a5d047a438f48c4c81e46b' into kraken
* commit '
aed937ba46e4137ad5a5d047a438f48c4c81e46b':
Fixed a bunch of stuff in the prelink mappings file:
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