Ying Wang
a07d37b793
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
2010-06-09 12:08:07 -07:00
Ying Wang
66356cef22
am 7a794289
: Merge "Unbundle the build system." into froyo
...
Merge commit '7a7942899eedde3b946768a155fac3d70af5c9c3' into kraken
* commit '7a7942899eedde3b946768a155fac3d70af5c9c3':
Unbundle the build system.
2010-06-09 11:33:32 -07:00
Ying Wang
7a7942899e
Merge "Unbundle the build system." into froyo
2010-06-09 11:31:29 -07:00
Ying Wang
0f6f4ca54e
Unbundle the build system.
...
Change-Id: I88912d876c3972212e8871b3e5b3b8b6d2da34d0
2010-06-09 10:26:26 -07:00
Eric Laurent
452c31bc2d
Added prelinked library for audio effects JNI.
...
Change-Id: Ic3d26cedbff599c3ee6fed080b64fce5375ea940
2010-06-09 06:51:12 -07:00
The Android Automerger
066933bbae
FRF69C
...
Change-Id: Ied558c99dc92e0fdbf888e507cd8c35ac210b51e
2010-06-08 17:57:58 -07:00
The Android Automerger
a0737f734f
FRF69B
...
Change-Id: Ia90d822a9a271e729d3525c8aed6518746a118bf
2010-06-08 17:10:25 -07:00
The Android Automerger
469ffc607e
Merge branch 'froyo' into froyo-release
2010-06-08 17:10:05 -07:00
The Android Automerger
626d7ae7d4
FRF69
...
Change-Id: Id46f5d68895e92ebb51047a608c7f779aeab7f46
2010-06-08 14:09:14 -07:00
Jeff Hamilton
02fc62673e
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.
2010-06-08 14:04:28 -07:00
Jeff Hamilton
04be0d869a
Set JAVA_HOME to point to java 1.5.
...
Change-Id: I1304b78b17cd13a2231c59385a94e0430a8198ff
2010-06-08 15:38:47 -05:00
The Android Automerger
4117a8bf8a
FRF68
...
Change-Id: Iafa754a31276d3658c45a424d86b9a73d6618fe1
2010-06-07 22:05:04 -07:00
The Android Open Source Project
c2f5c0964b
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.
2010-06-04 09:53:20 -07:00
The Android Open Source Project
4873d8f5ca
merge from open-source master
...
Change-Id: Id3161ac44e0eaba0184b3d2d4af43e4e40d26e90
2010-06-04 07:56:24 -07:00
The Android Automerger
4844bb5231
FRF64
...
Change-Id: I791a6e152fa97089042deeb0260ba70c8bf0eabc
2010-06-03 16:21:19 -07:00
The Android Automerger
819cc02d98
Merge branch 'froyo' into froyo-release
2010-06-03 16:21:06 -07:00
Jeff Hamilton
8d09b69e2d
Build host tools as 32bit on all Darwin machines.
...
Change-Id: I121b388056e68b787518c66a01c172bc4ffaef9b
2010-06-03 17:59:11 -05:00
Jeff Hamilton
ebc2869b8d
Build host tools as 32bit on all Darwin machines.
...
Change-Id: I121b388056e68b787518c66a01c172bc4ffaef9b
2010-06-03 12:29:19 -05:00
Joe Onorato
13a90e3a20
Add SystemUI.apk to the generic build.
...
Change-Id: I03d92d93fbcb51808a096fb7d48c1b693efa777d
2010-06-02 14:48:35 -07:00
Ying Wang
eee0178732
am e8ffa149
: am ba16a89d
: Override LOCAL_CERTIFICATE in inherit-package.
...
Merge commit 'e8ffa1490023eff03335b550c582eaadd3a4561b' into kraken
* commit 'e8ffa1490023eff03335b550c582eaadd3a4561b':
Override LOCAL_CERTIFICATE in inherit-package.
2010-06-02 14:38:43 -07:00
Ying Wang
e8ffa14900
am ba16a89d
: Override LOCAL_CERTIFICATE in inherit-package.
...
Merge commit 'ba16a89dbd61003a3b907d0f5e8fc48fba2afcab' into froyo-plus-aosp
* commit 'ba16a89dbd61003a3b907d0f5e8fc48fba2afcab':
Override LOCAL_CERTIFICATE in inherit-package.
2010-06-02 14:37:28 -07:00
Andy McFadden
f8e9fb3b2a
Merge "Atomic/SMP update." into kraken
2010-06-02 13:46:11 -07:00
Ying Wang
ba16a89dbd
Override LOCAL_CERTIFICATE in inherit-package.
...
it's to fix typo.
Change-Id: I9a791faa4b7b5967b5d23bfcb4caeebaef94e723
2010-06-02 13:24:36 -07:00
Ying Wang
f33c3ef933
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
2010-06-02 13:11:32 -07:00
Ying Wang
b93e03cbc9
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
2010-06-02 13:09:12 -07:00
Andy McFadden
5f2b36f854
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
2010-06-01 08:37:16 -07:00
The Android Automerger
6279ceb8e6
FRF58
...
Change-Id: Id34e0594991501e259f6e3487e5f965bf397143e
2010-05-28 15:50:07 -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
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
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
588d529e73
Merge "Make Vorbis decoding through stagefright the default." into kraken
2010-05-25 13:57:29 -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
Eric Laurent
ba12575bd2
Merge "Fix issue 2667796 [Audio Effect Framework] Effect factory and libraries." into kraken
2010-05-24 23:23:05 -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
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
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
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