OSDN Git Service

android-x86/build.git
14 years agoresolved conflicts for merge of f83fd362 to master
Ying Wang [Wed, 9 Jun 2010 18:48:48 +0000 (11:48 -0700)]
resolved conflicts for merge of f83fd362 to master

Change-Id: I527111ec1461e258b4911a2aaa90100eceacea80

14 years agoam 66356cef: am 7a794289: Merge "Unbundle the build system." into froyo
Ying Wang [Wed, 9 Jun 2010 18:35:32 +0000 (11:35 -0700)]
am 66356cef: am 7a794289: Merge "Unbundle the build system." into froyo

14 years agoam 7a794289: Merge "Unbundle the build system." into froyo
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.

14 years agoMerge "Unbundle the build system." into froyo
Ying Wang [Wed, 9 Jun 2010 18:31:29 +0000 (11:31 -0700)]
Merge "Unbundle the build system." into froyo

14 years agoUnbundle the build system.
Ying Wang [Wed, 9 Jun 2010 17:26:26 +0000 (10:26 -0700)]
Unbundle the build system.

Change-Id: I88912d876c3972212e8871b3e5b3b8b6d2da34d0

14 years agoam a207ba0d: am 02fc6267: am 04be0d86: Set JAVA_HOME to point to java 1.5.
Jeff Hamilton [Tue, 8 Jun 2010 21:07:47 +0000 (14:07 -0700)]
am a207ba0d: am 02fc6267: am 04be0d86: Set JAVA_HOME to point to java 1.5.

14 years agoam 02fc6267: am 04be0d86: Set JAVA_HOME to point to java 1.5.
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.

14 years agoam 04be0d86: 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.

14 years agoSet 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

14 years agoRevamp resources listing, part 2 (droiddoc).
Roman Nurik [Tue, 2 Mar 2010 02:35:13 +0000 (18:35 -0800)]
Revamp resources listing, part 2 (droiddoc).

- Fix docs navigation JS to correctly handle pages with query strings (i.e. browser.html?tag=article)
- Add resource browser CSS and JS to complement browser.jd in frameworks/base.
- Add microtemplate.js library for ease HTML templates in JS.

Change-Id: I518eeb5fc5a05dc6775eb3870eb88ebb0fc7b72c

14 years agoam d29b9bef: am c2f5c096: am 4873d8f5: (-s ours) merge from open-source master
The Android Open Source Project [Fri, 4 Jun 2010 16:56:12 +0000 (09:56 -0700)]
am d29b9bef: am c2f5c096: am 4873d8f5: (-s ours) merge from open-source master

14 years agoam c2f5c096: am 4873d8f5: (-s ours) merge from open-source master
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

14 years agoam 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.

14 years agomerge from open-source master
The Android Open Source Project [Fri, 4 Jun 2010 14:56:24 +0000 (07:56 -0700)]
merge from open-source master

Change-Id: Id3161ac44e0eaba0184b3d2d4af43e4e40d26e90

14 years agoBuild 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

14 years agoam 858e4d5b: am ebc2869b: Build host tools as 32bit on all Darwin machines.
Jeff Hamilton [Thu, 3 Jun 2010 20:12:32 +0000 (13:12 -0700)]
am 858e4d5b: am ebc2869b: Build host tools as 32bit on all Darwin machines.

14 years agoam ebc2869b: Build host tools as 32bit on all Darwin machines.
Jeff Hamilton [Thu, 3 Jun 2010 20:10:54 +0000 (13:10 -0700)]
am ebc2869b: Build host tools as 32bit on all Darwin machines.

14 years agoBuild 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

14 years agoam a65ecab3: am 13a90e3a: Add SystemUI.apk to the generic build.
Joe Onorato [Thu, 3 Jun 2010 05:41:24 +0000 (22:41 -0700)]
am a65ecab3: am 13a90e3a: Add SystemUI.apk to the generic build.

14 years agoam 2e684553: am eee01787: am e8ffa149: am ba16a89d: Override LOCAL_CERTIFICATE in...
Ying Wang [Thu, 3 Jun 2010 05:35:33 +0000 (22:35 -0700)]
am 2e684553: am eee01787: am e8ffa149: am ba16a89d: Override LOCAL_CERTIFICATE in inherit-package.

14 years agoam eabec90b: am f8e9fb3b: Merge "Atomic/SMP update." into kraken
Andy McFadden [Thu, 3 Jun 2010 05:35:14 +0000 (22:35 -0700)]
am eabec90b: am f8e9fb3b: Merge "Atomic/SMP update." into kraken

14 years agoam 5cceb024: (-s ours) am f33c3ef9: am b93e03cb: am 52911309: Cherry-pick unbundled...
Ying Wang [Thu, 3 Jun 2010 05:35:12 +0000 (22:35 -0700)]
am 5cceb024: (-s ours) am f33c3ef9: am b93e03cb: am 52911309: Cherry-pick unbundled build changes from master

14 years agoam 13a90e3a: Add SystemUI.apk to the generic build.
Joe Onorato [Wed, 2 Jun 2010 23:29:33 +0000 (16:29 -0700)]
am 13a90e3a: Add SystemUI.apk to the generic build.

14 years agoAdd 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

14 years agoam eee01787: am e8ffa149: am ba16a89d: Override LOCAL_CERTIFICATE in inherit-package.
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.

14 years agoam 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.

14 years agoam ba16a89d: 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.

14 years agoam f8e9fb3b: Merge "Atomic/SMP update." into kraken
Andy McFadden [Wed, 2 Jun 2010 20:47:41 +0000 (13:47 -0700)]
am f8e9fb3b: Merge "Atomic/SMP update." into kraken

14 years agoMerge "Atomic/SMP update." into kraken
Andy McFadden [Wed, 2 Jun 2010 20:46:11 +0000 (13:46 -0700)]
Merge "Atomic/SMP update." into kraken

14 years agoOverride 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

14 years agoam f33c3ef9: am b93e03cb: am 52911309: Cherry-pick unbundled build changes from master
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

14 years agoam 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

14 years agoam 52911309: 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

14 years agoam 09082d12: am 8a06bac1: Make make ECLIPSE-lunch build a .classpath for all the...
Joe Onorato [Tue, 1 Jun 2010 23:09:51 +0000 (16:09 -0700)]
am 09082d12: am 8a06bac1: Make make ECLIPSE-lunch build a .classpath for all the java stuff that will be included in the build.

14 years agoAtomic/SMP update.
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

14 years agoam 8a06bac1: Make make ECLIPSE-lunch build a .classpath for all the java stuff that...
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.

14 years agoFix "make cts" for refactored libcore
Brian Carlstrom [Sat, 29 May 2010 01:47:17 +0000 (18:47 -0700)]
Fix "make cts" for refactored libcore

Change-Id: I718ee82681a4989205118d3e828567971e5f1849

14 years agoDeleting test builds obsoleted by libcore reorg
Brian Carlstrom [Sat, 29 May 2010 00:02:57 +0000 (17:02 -0700)]
Deleting test builds obsoleted by libcore reorg

Change-Id: Ia8f5984e5ba03d1429c31c48d098cb044305cab1

14 years agoFix "argument list too long"
Ying Wang [Thu, 27 May 2010 18:55:39 +0000 (11:55 -0700)]
Fix "argument list too long"

Bug http://b/issue?id=2718472

Change-Id: I07eaf0d9dff2fa7c86f59bc50fb3b28516642301

14 years agoMake make ECLIPSE-lunch build a .classpath for all the java stuff that will be includ...
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

14 years agoCherry-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

14 years agoMerge "Work around a bug with <T> ... <? extends T[]> methods."
Elliott Hughes [Wed, 26 May 2010 19:38:31 +0000 (12:38 -0700)]
Merge "Work around a bug with <T> ... <? extends T[]> methods."

14 years agoam eae2720b: am 3a212f0f: am 0c5363c8: am 8e5605a7: Add QuickSearchBox to the SDK...
Xavier Ducrohet [Wed, 26 May 2010 18:42:46 +0000 (11:42 -0700)]
am eae2720b: am 3a212f0f: am 0c5363c8: am 8e5605a7: Add QuickSearchBox to the SDK build.

14 years agoWork around a bug with <T> ... <? extends T[]> methods.
Elliott Hughes [Wed, 26 May 2010 03:17:20 +0000 (20:17 -0700)]
Work around a bug with <T> ... <? extends T[]> methods.

Java 6 adds an Arrays.copyOf method that confuses droiddoc into producing
a class "Array" in the anonymous package. I've raised a bug for someone
to work out why and fix this properly (after spending a fairly fruitless
afternoon on it). This work-around filters that out the cruft. I've checked
the generated current.xml file and the generated java.util.Arrays stubs,
and they're both correct. The extent of droiddoc's confusion appears to be
limited to inventing a non-existent class. (My guess is that it doesn't
realize that the element type of the array is a type parameter, not a type,
and it ends up using a default type name of "Array" from somewhere [javadoc
itself?].)

Bug: 2715505
Change-Id: I2ad7ecc819e320a1d209720b3dfbef45bbd89877

14 years agoam 3a212f0f: am 0c5363c8: am 8e5605a7: Add QuickSearchBox to the SDK build.
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.

14 years agoam 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.

14 years agoam 8e5605a7: 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.

14 years agoAdd 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

14 years agoam 3388f183: am 588d529e: Merge "Make Vorbis decoding through stagefright the default...
Andreas Huber [Tue, 25 May 2010 21:19:17 +0000 (14:19 -0700)]
am 3388f183: am 588d529e: Merge "Make Vorbis decoding through stagefright the default." into kraken

14 years agoam 588d529e: Merge "Make Vorbis decoding through stagefright the default." into kraken
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

14 years agoMerge "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

14 years agoam 168cd06c: am 9589164c: am b7ebe01f: am ca671ab7: Revert "Doc change: Update froyo...
Scott Main [Tue, 25 May 2010 19:36:20 +0000 (12:36 -0700)]
am 168cd06c: am 9589164c: am b7ebe01f: am ca671ab7: Revert "Doc change: Update froyo mark for home"

14 years agoam 9589164c: am b7ebe01f: am ca671ab7: Revert "Doc change: Update froyo mark for...
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"

14 years agoam 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"

14 years agoam ca671ab7: 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"

14 years agoMake Vorbis decoding through stagefright the default.
Andreas Huber [Tue, 25 May 2010 19:27:03 +0000 (12:27 -0700)]
Make Vorbis decoding through stagefright the default.

Change-Id: I4273b766024f5363fdd05c3d30d0c71209679950

14 years agoRevert "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.

14 years agoMerge "Include all resources for unbundled app builds."
Ying Wang [Tue, 25 May 2010 17:48:21 +0000 (10:48 -0700)]
Merge "Include all resources for unbundled app builds."

14 years agoam 045fcc72: am ba12575b: Merge "Fix issue 2667796 [Audio Effect Framework] Effect...
Eric Laurent [Tue, 25 May 2010 06:25:35 +0000 (23:25 -0700)]
am 045fcc72: am ba12575b: Merge "Fix issue 2667796 [Audio Effect Framework] Effect factory and libraries." into kraken

14 years agoam ba12575b: Merge "Fix issue 2667796 [Audio Effect Framework] Effect factory and...
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

14 years agoMerge "Fix issue 2667796 [Audio Effect Framework] Effect factory and libraries."...
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

14 years agoInclude all resources for unbundled app builds.
Ying Wang [Mon, 24 May 2010 20:50:35 +0000 (13:50 -0700)]
Include all resources for unbundled app builds.

Change-Id: I78c67e8f9ea42aaeb06b3f8986110f8367bede3a
http://b/issue?id=2698843

14 years agoam 8a0a937b: am ed43e3d7: Merge "Set no camera default for emulator/generic/sim build...
Chih-Chung Chang [Mon, 24 May 2010 04:06:18 +0000 (21:06 -0700)]
am 8a0a937b: am ed43e3d7: Merge "Set no camera default for emulator/generic/sim builds." into kraken

14 years agoam ed43e3d7: Merge "Set no camera default for emulator/generic/sim builds." into...
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

14 years agoMerge "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

14 years agoMerge "Improve on unbundled app build"
Ying Wang [Fri, 21 May 2010 22:11:52 +0000 (15:11 -0700)]
Merge "Improve on unbundled app build"

14 years agoMerge "Dist unbundled app."
Ying Wang [Fri, 21 May 2010 22:11:46 +0000 (15:11 -0700)]
Merge "Dist unbundled app."

14 years agoMerge "Support for unbundled app build"
Ying Wang [Fri, 21 May 2010 22:11:40 +0000 (15:11 -0700)]
Merge "Support for unbundled app build"

14 years agoFix issue 2667796 [Audio Effect Framework] Effect factory and libraries.
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

14 years agoam 4856af65: am 90fa8093: am d44754e0: am e9b01eb4: Doc change: add tv assets for...
Dirk Dougherty [Thu, 20 May 2010 07:20:56 +0000 (00:20 -0700)]
am 4856af65: am 90fa8093: am d44754e0: am e9b01eb4: Doc change: add tv assets for carousel.

14 years agoam 90fa8093: am d44754e0: am e9b01eb4: Doc change: add tv assets for carousel.
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.

14 years agoam 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.

14 years agoam e9b01eb4: 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.

14 years agoDoc 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

14 years agoam 4150816f: am 5caaeadb: am e5cfdbfb: am 9d1d6441: Doc change: Update froyo mark...
Dirk Dougherty [Thu, 20 May 2010 02:02:26 +0000 (19:02 -0700)]
am 4150816f: am 5caaeadb: am e5cfdbfb: am 9d1d6441: Doc change: Update froyo mark for home

14 years agoam 5caaeadb: am e5cfdbfb: am 9d1d6441: Doc change: Update froyo mark for home
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

14 years agoam 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

14 years agoam 9d1d6441: 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

14 years agoDoc 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

14 years agoImprove on unbundled app build
Ying Wang [Thu, 20 May 2010 00:03:14 +0000 (17:03 -0700)]
Improve on unbundled app build

1. build only apps specified in APP-xxx.
2. support building multiple apps in a single make: make APP-Gmail-GmailTests-xxx

Change-Id: I863d3b503a240ae43652e9b18043b60416bcc25a

14 years agoDist unbundled app.
Ying Wang [Tue, 11 May 2010 21:36:32 +0000 (14:36 -0700)]
Dist unbundled app.

Change-Id: Ib4c01b2623ec1059b66c541cc35eae4d2d811ef3
http://b/issue?id=2667113

14 years agoSupport for unbundled app build
Ying Wang [Mon, 10 May 2010 23:35:39 +0000 (16:35 -0700)]
Support for unbundled app build

With this CL, run "make APP-{appname}" to build unbundled app in
the unbundled app src tree.
See http://b/issue?id=2667113

Change-Id: I1d753db795142508bc841ae66b4408220ab687c5

14 years agoam cac3e580: (-s ours) am 18b75566: Squashed commit of the following (DO NOT MERGE):
Guang Zhu [Wed, 19 May 2010 01:46:45 +0000 (18:46 -0700)]
am cac3e580: (-s ours) am 18b75566: Squashed commit of the following (DO NOT MERGE):

14 years agoam 18b75566: Squashed commit of the following (DO NOT MERGE):
Guang Zhu [Wed, 19 May 2010 01:45:46 +0000 (18:45 -0700)]
am 18b75566: Squashed commit of the following (DO NOT MERGE):

14 years agoSquashed 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

14 years agoChanging the footer per legal guidance.
Dan Morrill [Tue, 18 May 2010 05:44:27 +0000 (22:44 -0700)]
Changing the footer per legal guidance.

Change-Id: Ia20e3b1a69265e1ffe0b50993be12dcd96afa05f

14 years agoam 4873a26f: am 01c35179: Fix typo.
Ying Wang [Tue, 18 May 2010 02:25:13 +0000 (19:25 -0700)]
am 4873a26f: am 01c35179: Fix typo.

14 years agoam 01c35179: Fix typo.
Ying Wang [Tue, 18 May 2010 02:24:11 +0000 (19:24 -0700)]
am 01c35179: Fix typo.

14 years agoFix typo.
Ying Wang [Tue, 18 May 2010 02:07:21 +0000 (19:07 -0700)]
Fix typo.

Change-Id: I6eb60e7b89bd331deaa46e2c3f746aa2b042e1b4

14 years agoam ecfca8a5: am 4f9c2052: fix typo
Joe Onorato [Tue, 18 May 2010 01:44:35 +0000 (18:44 -0700)]
am ecfca8a5: am 4f9c2052: fix typo

14 years agoam 4f9c2052: fix typo
Joe Onorato [Tue, 18 May 2010 01:42:32 +0000 (18:42 -0700)]
am 4f9c2052: fix typo

14 years agofix typo
Joe Onorato [Tue, 18 May 2010 01:40:39 +0000 (18:40 -0700)]
fix typo

Change-Id: Ic00f82ea7bbe570ef30f52b353ba147664d755d7

14 years agoam 36ce8736: am 77dc0a58: Add a rule that builds an eclipse project file for an app.
Joe Onorato [Tue, 18 May 2010 01:30:45 +0000 (18:30 -0700)]
am 36ce8736: am 77dc0a58: Add a rule that builds an eclipse project file for an app.

14 years agoam 77dc0a58: Add a rule that builds an eclipse project file for an app.
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.

14 years agoAdd 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

14 years agoam 06dae704: am d868cad8: Add -Werror=format-security
Nick Kralevich [Mon, 17 May 2010 22:28:14 +0000 (15:28 -0700)]
am 06dae704: am d868cad8: Add -Werror=format-security

14 years agoam d868cad8: Add -Werror=format-security
Nick Kralevich [Mon, 17 May 2010 22:25:11 +0000 (15:25 -0700)]
am d868cad8: Add -Werror=format-security

14 years agoMerge "Allow java source in LOCAL_GENERATED_SOURCE"
Ying Wang [Mon, 17 May 2010 21:59:40 +0000 (14:59 -0700)]
Merge "Allow java source in LOCAL_GENERATED_SOURCE"

14 years agoAllow java source in LOCAL_GENERATED_SOURCE
Ying Wang [Fri, 14 May 2010 23:40:44 +0000 (16:40 -0700)]
Allow java source in LOCAL_GENERATED_SOURCE

Change-Id: I82f426f1523f56a87ad396f2d7928b839f7c3ec9

14 years agoAdd -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