The Android Automerger
6279ceb8e6
FRF58
...
Change-Id: Id34e0594991501e259f6e3487e5f965bf397143e
2010-05-28 15:50:07 -07:00
Ying Wang
e4b24ebab8
Fix "argument list too long"
...
Bug http://b/issue?id=2718472
Change-Id: I07eaf0d9dff2fa7c86f59bc50fb3b28516642301
2010-05-27 14:41:31 -07:00
The Android Automerger
7f9802b0c1
FRF57
...
Change-Id: I4ff4cac94816e9a5947fbe4956655665ef3669b3
2010-05-27 13:21:39 -07:00
Joe Onorato
8a06bac1db
Make make ECLIPSE-lunch build a .classpath for all the java stuff that will be included in the
...
build.
Change-Id: I5a6066fa2afc9cb7bea794770bbb589615a1f9eb
2010-05-26 17:58:21 -04:00
Ying Wang
5291130983
Cherry-pick unbundled build changes from master
...
Change-Id: I82cab32f00b7b729d9b01c8e1532c8bf0ad2fb92
2010-05-26 13:39:31 -07:00
Elliott Hughes
00ab00abb1
Merge "Work around a bug with <T> ... <? extends T[]> methods."
2010-05-26 12:38:32 -07:00
Xavier Ducrohet
d5f3db8a1f
am eae2720b: am 3a212f0f: am 0c5363c8: am 8e5605a7: Add QuickSearchBox to the SDK build.
2010-05-26 11:42:46 -07:00
Elliott Hughes
5479d77e32
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
2010-05-26 11:41:33 -07:00
The Android Automerger
b0de05ba3f
FRF55
...
Change-Id: I1427e9b235a7a9116da2fa3b8b88317511409e4c
2010-05-25 21:23:40 -07:00
The Android Automerger
6d6d2c03db
Merge branch 'froyo' into froyo-release
2010-05-25 21:23:29 -07:00
Xavier Ducrohet
eae2720bb8
am 3a212f0f: am 0c5363c8: am 8e5605a7: Add QuickSearchBox to the SDK build.
2010-05-25 17:51:36 -07:00
Xavier Ducrohet
3a212f0fb6
am 0c5363c8: am 8e5605a7: Add QuickSearchBox to the SDK build.
...
Merge commit '0c5363c8571eef11eeb21a575da941565c34191e' into kraken
* commit '0c5363c8571eef11eeb21a575da941565c34191e':
Add QuickSearchBox to the SDK build.
2010-05-25 17:50:43 -07:00
Xavier Ducrohet
0c5363c857
am 8e5605a7: Add QuickSearchBox to the SDK build.
...
Merge commit '8e5605a774fd2f61c6d5bae0440b20fc0bdd79f7' into froyo-plus-aosp
* commit '8e5605a774fd2f61c6d5bae0440b20fc0bdd79f7':
Add QuickSearchBox to the SDK build.
2010-05-25 17:49:24 -07:00
Xavier Ducrohet
8e5605a774
Add QuickSearchBox to the SDK build.
...
Change-Id: Ia0cc7b4cd8245d368685d50cf32cd21875cbdbbf
2010-05-25 17:03:42 -07:00
Andreas Huber
c677db71e8
am 3388f183: am 588d529e: Merge "Make Vorbis decoding through stagefright the default." into kraken
2010-05-25 14:19:17 -07:00
Andreas Huber
3388f183b7
am 588d529e: Merge "Make Vorbis decoding through stagefright the default." into kraken
2010-05-25 14:17:42 -07:00
Andreas Huber
588d529e73
Merge "Make Vorbis decoding through stagefright the default." into kraken
2010-05-25 13:57:29 -07:00
Scott Main
ab90d31c2b
am 168cd06c: am 9589164c: am b7ebe01f: am ca671ab7: Revert "Doc change: Update froyo mark for home"
2010-05-25 12:36:20 -07:00
Scott Main
168cd06cf0
am 9589164c: am b7ebe01f: am ca671ab7: Revert "Doc change: Update froyo mark for home"
2010-05-25 12:34:24 -07:00
Scott Main
9589164caa
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"
2010-05-25 12:33:03 -07:00
Scott Main
b7ebe01f60
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"
2010-05-25 12:31:29 -07:00
Andreas Huber
1c180a05c7
Make Vorbis decoding through stagefright the default.
...
Change-Id: I4273b766024f5363fdd05c3d30d0c71209679950
2010-05-25 12:27:03 -07:00
Scott Main
ca671ab7a6
Revert "Doc change: Update froyo mark for home"
...
This reverts commit 9d1d6441d9
.
2010-05-25 12:22:29 -07:00
Ying Wang
73d51db60e
Merge "Include all resources for unbundled app builds."
2010-05-25 10:48:21 -07:00
Eric Laurent
7b993eb879
am 045fcc72: am ba12575b: Merge "Fix issue 2667796 [Audio Effect Framework] Effect factory and libraries." into kraken
2010-05-24 23:25:35 -07:00
Eric Laurent
045fcc728f
am ba12575b: Merge "Fix issue 2667796 [Audio Effect Framework] Effect factory and libraries." into kraken
2010-05-24 23:24:39 -07:00
Eric Laurent
ba12575bd2
Merge "Fix issue 2667796 [Audio Effect Framework] Effect factory and libraries." into kraken
2010-05-24 23:23:05 -07:00
Ying Wang
62e145d20d
Include all resources for unbundled app builds.
...
Change-Id: I78c67e8f9ea42aaeb06b3f8986110f8367bede3a
http://b/issue?id=2698843
2010-05-24 13:50:35 -07:00
Chih-Chung Chang
bd41bc1247
am 8a0a937b: am ed43e3d7: Merge "Set no camera default for emulator/generic/sim builds." into kraken
2010-05-23 21:06:18 -07:00
Chih-Chung Chang
8a0a937b3f
am ed43e3d7: Merge "Set no camera default for emulator/generic/sim builds." into kraken
2010-05-23 21:05:13 -07:00
Chih-Chung Chang
ed43e3d784
Merge "Set no camera default for emulator/generic/sim builds." into kraken
2010-05-23 21:03:38 -07:00
Christian Mehlmauer
8056ee21f0
generic.mk: Replaced AlarmClock with newer DeskClock App
...
Change-Id: I2afe4876b1dd7e9e9200e27ba64eebe4a34065fb
2010-05-22 22:22:26 +02:00
Ying Wang
8f70ce50f7
Merge "Improve on unbundled app build"
2010-05-21 15:11:52 -07:00
Ying Wang
34a583a36f
Merge "Dist unbundled app."
2010-05-21 15:11:46 -07:00
Ying Wang
caffff9617
Merge "Support for unbundled app build"
2010-05-21 15:11:40 -07:00
The Android Automerger
73fa4725c9
FRF51
...
Change-Id: I14c23a70aba39001873862a33bbfae93d3f8af64
2010-05-21 12:59:19 -07:00
Eric Laurent
c5307b85c5
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
2010-05-21 06:04:15 -07:00
The Android Automerger
fc073ec500
FRF50
...
Change-Id: Ie060d31c557cfce996f1d4c1d316d03af7d0bd67
2010-05-20 12:28:22 -07:00
The Android Automerger
fd6bd8e76e
Merge branch 'froyo' into froyo-release
2010-05-20 12:28:03 -07:00
Dirk Dougherty
b510ff8163
am 4856af65: am 90fa8093: am d44754e0: am e9b01eb4: Doc change: add tv assets for carousel.
2010-05-20 00:20:56 -07:00
Dirk Dougherty
4856af65b2
am 90fa8093: am d44754e0: am e9b01eb4: Doc change: add tv assets for carousel.
2010-05-20 00:18:53 -07:00
Dirk Dougherty
90fa80937d
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.
2010-05-20 00:17:09 -07:00
Dirk Dougherty
d44754e0e5
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.
2010-05-20 00:15:38 -07:00
Dirk Dougherty
e9b01eb46d
Doc change: add tv assets for carousel.
...
Change-Id: I357509c83e64ceb898b2069482ff1d0f3b3337cc
2010-05-19 19:42:12 -07:00
Dirk Dougherty
4ad0ca603b
am 4150816f: am 5caaeadb: am e5cfdbfb: am 9d1d6441: Doc change: Update froyo mark for home
2010-05-19 19:02:26 -07:00
Dirk Dougherty
4150816fc4
am 5caaeadb: am e5cfdbfb: am 9d1d6441: Doc change: Update froyo mark for home
2010-05-19 19:00:45 -07:00
Dirk Dougherty
5caaeadb10
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
2010-05-19 18:59:53 -07:00
Dirk Dougherty
e5cfdbfb17
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
2010-05-19 18:58:05 -07:00
Dirk Dougherty
9d1d6441d9
Doc change: Update froyo mark for home
...
Change-Id: Idacecd87faca95cd258436ab842c03102e5fc6c6
2010-05-19 18:25:33 -07:00
Ying Wang
00f3a02b0f
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
2010-05-19 17:07:00 -07:00