OSDN Git Service
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: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: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: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:08:47 +0000 (02:08 -0700)]
am
1d2c25b7: kraken --> gingerbread
Merge commit '
1d2c25b7804e6fcee213b5ed81594f48c563e2eb' into gingerbread-plus-aosp
* commit '
1d2c25b7804e6fcee213b5ed81594f48c563e2eb':
kraken --> gingerbread
Ed Heyl [Fri, 11 Jun 2010 09:06:03 +0000 (02:06 -0700)]
kraken --> gingerbread
Change-Id: I7710134ec026b9c494fe2912809607c162b5ac51
Jean-Baptiste Queru [Wed, 9 Jun 2010 22:56:15 +0000 (15:56 -0700)]
merge from froyo-plus-aosp
Change-Id: Ie085dd2e50a68bb79699f98d31ef8ceb0fe8d339
Jeff Hamilton [Wed, 9 Jun 2010 22:42:56 +0000 (15:42 -0700)]
am
f9f513ab: 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 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:35:32 +0000 (11:35 -0700)]
am
66356cef: am
7a794289: Merge "Unbundle the build system." into froyo
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: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
Jeff Hamilton [Tue, 8 Jun 2010 21:05:52 +0000 (14:05 -0700)]
am
02fc6267: am
04be0d86: Set JAVA_HOME to point to java 1.5.
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 [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 [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 16:54:51 +0000 (09:54 -0700)]
am
c2f5c096: am
4873d8f5: (-s ours) merge from open-source master
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 [Thu, 3 Jun 2010 20:10:54 +0000 (13:10 -0700)]
am
ebc2869b: Build host tools as 32bit on all Darwin machines.
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 [Wed, 2 Jun 2010 23:29:33 +0000 (16:29 -0700)]
am
13a90e3a: Add SystemUI.apk to the generic build.
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:40:32 +0000 (14:40 -0700)]
am
eee01787: am
e8ffa149: am
ba16a89d: Override LOCAL_CERTIFICATE in inherit-package.
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:47:41 +0000 (13:47 -0700)]
am
f8e9fb3b: Merge "Atomic/SMP update." into kraken
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:13:32 +0000 (13:13 -0700)]
am
f33c3ef9: am
b93e03cb: am
52911309: Cherry-pick unbundled build changes from master
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 [Tue, 1 Jun 2010 02:06:18 +0000 (19:06 -0700)]
am
8a06bac1: Make make ECLIPSE-lunch build a .classpath for all the java stuff that will be included in the build.
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:51:36 +0000 (17:51 -0700)]
am
3a212f0f: am
0c5363c8: am
8e5605a7: Add QuickSearchBox to the SDK build.
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 21:17:42 +0000 (14:17 -0700)]
am
588d529e: Merge "Make Vorbis decoding through stagefright the default." into kraken
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:34:24 +0000 (12:34 -0700)]
am
9589164c: am
b7ebe01f: am
ca671ab7: Revert "Doc change: Update froyo mark for home"
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:24:39 +0000 (23:24 -0700)]
am
ba12575b: Merge "Fix issue
2667796 [Audio Effect Framework] Effect factory and libraries." into kraken
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:05:13 +0000 (21:05 -0700)]
am
ed43e3d7: Merge "Set no camera default for emulator/generic/sim builds." 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:18:53 +0000 (00:18 -0700)]
am
90fa8093: am
d44754e0: am
e9b01eb4: Doc change: add tv assets for carousel.
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 02:00:45 +0000 (19:00 -0700)]
am
5caaeadb: am
e5cfdbfb: am
9d1d6441: Doc change: Update froyo mark for home
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 [Wed, 19 May 2010 01:45:46 +0000 (18:45 -0700)]
am
18b75566: Squashed commit of the following (DO NOT MERGE):
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:24:11 +0000 (19:24 -0700)]
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:42:32 +0000 (18:42 -0700)]
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:29:04 +0000 (18:29 -0700)]
am
77dc0a58: Add a rule that builds an eclipse project file for an app.
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 [Mon, 17 May 2010 22:25:11 +0000 (15:25 -0700)]
am
d868cad8: Add -Werror=format-security
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:55:28 +0000 (15:55 -0700)]
am
57b44e52: am
bc12cd04: merge from open-source master
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:38:37 +0000 (14:38 -0700)]
am
216d8448: am
95f862bc: merge from open-source master
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:45:20 +0000 (13:45 -0700)]
am
105a934f: am
9514fca5: merge from open-source master
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 [Fri, 14 May 2010 16:34:22 +0000 (09:34 -0700)]
am
06df2923: libdrm2 is never used. Remove the reference to it.
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
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:13:00 +0000 (11:13 -0700)]
am
f48c3ac3: am
f7c63421: merge from open-source master
OSDN Git Service
