OSDN Git Service
The Android Open Source Project [Tue, 19 Jul 2011 17:10:30 +0000 (10:10 -0700)]
Reconcile with honeycomb-LTE-release
Change-Id: I23ee9d5a76c931031ca51bc9b93938cd48c39498
The Android Automerger [Tue, 19 Jul 2011 14:16:12 +0000 (07:16 -0700)]
HLK19
Change-Id: I003e95a859cb73fad40d6069aa5521f34660a927
The Android Automerger [Tue, 19 Jul 2011 14:16:04 +0000 (07:16 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
The Android Automerger [Mon, 18 Jul 2011 23:03:14 +0000 (16:03 -0700)]
HLK18B
Change-Id: Id19ef186c942370c8ddf9c2e0bdfa5651469fbb5
The Android Automerger [Mon, 18 Jul 2011 23:03:08 +0000 (16:03 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
Marco Nelissen [Mon, 18 Jul 2011 21:46:09 +0000 (14:46 -0700)]
Add music effects control panel to the build.
Change-Id: If4cccd929b103d43dcd48f9ad453e2f850061b5d
Kenny Root [Mon, 18 Jul 2011 21:47:21 +0000 (14:47 -0700)]
am
3146eb76: am
1708a6f7: am
4880b436: am
62a2b188: Merge "Avoid complaining about empty directories"
* commit '
3146eb76cf193ce95f0f88a477b1c708a1b5cf9b':
Avoid complaining about empty directories
Kenny Root [Mon, 18 Jul 2011 20:48:43 +0000 (13:48 -0700)]
am
1708a6f7: am
4880b436: am
62a2b188: Merge "Avoid complaining about empty directories"
* commit '
1708a6f74bf36ad6d520476895695c26bdaf7306':
Avoid complaining about empty directories
Kenny Root [Mon, 18 Jul 2011 20:47:16 +0000 (13:47 -0700)]
am
4880b436: am
62a2b188: Merge "Avoid complaining about empty directories"
* commit '
4880b436656d7cfd00bb82ebde1b408e0bd19bda':
Avoid complaining about empty directories
Kenny Root [Mon, 18 Jul 2011 20:45:15 +0000 (13:45 -0700)]
am
62a2b188: Merge "Avoid complaining about empty directories"
* commit '
62a2b1882fb95e960b5889b46fe8f669ddc7c8ac':
Avoid complaining about empty directories
Kenny Root [Mon, 18 Jul 2011 20:41:25 +0000 (13:41 -0700)]
Merge "Avoid complaining about empty directories"
Kenny Root [Mon, 18 Jul 2011 20:11:34 +0000 (13:11 -0700)]
Avoid complaining about empty directories
Change-Id: If46bffd1c4e6b94f2e476b2d7d506ef337bbf8e1
Kenny Root [Mon, 18 Jul 2011 19:06:40 +0000 (12:06 -0700)]
am
1b61d1ba: am
db549686: am
099aa4cf: am
b8a1c89b: Merge "Only include "[a-z]*.bash" files for completion"
* commit '
1b61d1ba7b7f2c0017193bcfc3a28e30af1ce603':
Only include "[a-z]*.bash" files for completion
Kenny Root [Mon, 18 Jul 2011 19:01:29 +0000 (12:01 -0700)]
am
db549686: am
099aa4cf: am
b8a1c89b: Merge "Only include "[a-z]*.bash" files for completion"
* commit '
db5496867968fe592de807e606dc11287ca61c6a':
Only include "[a-z]*.bash" files for completion
Kenny Root [Mon, 18 Jul 2011 18:57:24 +0000 (11:57 -0700)]
am
099aa4cf: am
b8a1c89b: Merge "Only include "[a-z]*.bash" files for completion"
* commit '
099aa4cf4d82218110c6edf3edede0e72450216e':
Only include "[a-z]*.bash" files for completion
Kenny Root [Mon, 18 Jul 2011 18:54:15 +0000 (11:54 -0700)]
am
b8a1c89b: Merge "Only include "[a-z]*.bash" files for completion"
* commit '
b8a1c89b3a848ea343c897b33e77455dc2f98119':
Only include "[a-z]*.bash" files for completion
Kenny Root [Mon, 18 Jul 2011 18:44:26 +0000 (11:44 -0700)]
Merge "Only include "[a-z]*.bash" files for completion"
Kenny Root [Mon, 18 Jul 2011 18:15:31 +0000 (11:15 -0700)]
Only include "[a-z]*.bash" files for completion
Some people were using case-insensitive filesystems which broke when
including simply [a-z]* since it matched the uppercase files. Use this
to filter only the actual bash scripts.
Change-Id: Ibfdcf2c091a154f0485545537a044667783a19f7
Eric Laurent [Mon, 18 Jul 2011 15:43:35 +0000 (08:43 -0700)]
Merge "Added audio pre processing library"
The Android Open Source Project [Mon, 18 Jul 2011 15:09:54 +0000 (08:09 -0700)]
Reconcile with gingerbread-release honeycomb-LTE-release
Change-Id: I8e396934afd0c48b07bb5e28973f0c3e16beb8bb
The Android Automerger [Mon, 18 Jul 2011 14:25:51 +0000 (07:25 -0700)]
HLK18
Change-Id: Ib9de1e5c3155d1a712015611e8839afcd4848aca
The Android Automerger [Mon, 18 Jul 2011 14:25:47 +0000 (07:25 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
Eric Laurent [Sat, 18 Jun 2011 02:48:54 +0000 (19:48 -0700)]
Added audio pre processing library
Added wrapper library on top of webrtc audio processing modules.
Change-Id: I72105accb5d2159d5d69d28ec5b557a888b06e63
Jean-Baptiste Queru [Sat, 16 Jul 2011 01:12:27 +0000 (18:12 -0700)]
Merge "Remove Camera app from the generic build."
Jean-Baptiste Queru [Sat, 16 Jul 2011 00:47:14 +0000 (17:47 -0700)]
Remove Camera app from the generic build.
That's because a camera isn't required for compatibility and some
devices don't have a camera.
Add the Camera app in the emulator builds, since the emulator does
have a camera.
Change-Id: I56a1fe9f703c3b05dec99200a9353d75338c5f40
Kenny Root [Fri, 15 Jul 2011 22:14:51 +0000 (15:14 -0700)]
resolved conflicts for merge of
5cc2e94f to master
Change-Id: I7707603ae64fa3e4371fab2e81aab7ec37e69d33
Kenny Root [Fri, 15 Jul 2011 21:55:26 +0000 (14:55 -0700)]
am
cb255e51: am
8985d033: am
88dcfccb: Merge "Add bash completion to envsetup"
* commit '
cb255e514093eaa839b1ac2487bdc2ec60797415':
Add bash completion to envsetup
Kenny Root [Fri, 15 Jul 2011 21:52:57 +0000 (14:52 -0700)]
am
8985d033: am
88dcfccb: Merge "Add bash completion to envsetup"
* commit '
8985d0337814219235a9698c99cf318682367560':
Add bash completion to envsetup
Kenny Root [Fri, 15 Jul 2011 21:50:05 +0000 (14:50 -0700)]
am
88dcfccb: Merge "Add bash completion to envsetup"
* commit '
88dcfccb5b064735177e1a87f578d6c734b47bc7':
Add bash completion to envsetup
Kenny Root [Fri, 15 Jul 2011 21:41:14 +0000 (14:41 -0700)]
Merge "Add bash completion to envsetup"
Hugo Hudson [Fri, 15 Jul 2011 19:49:13 +0000 (12:49 -0700)]
Merge "Add in the variable speed library for use in the voicemail playback ui."
Hugo Hudson [Fri, 15 Jul 2011 19:17:55 +0000 (20:17 +0100)]
Add in the variable speed library for use in the voicemail playback ui.
- The variable speed audio library has been added to frameworks/ex.
Change-Id: Id4e3f8f3f36a504bed11026a9c5a05455c19cdf4
Kenny Root [Fri, 15 Jul 2011 18:07:06 +0000 (11:07 -0700)]
Add bash completion to envsetup
Change-Id: I0b4d74e72deede42d7e5f229593d79417f16bb55
The Android Automerger [Fri, 15 Jul 2011 17:45:25 +0000 (10:45 -0700)]
HLK15B
Change-Id: Ia0e0315a0f2917aa53329625d39b54e40ab9c239
The Android Automerger [Fri, 15 Jul 2011 17:45:20 +0000 (10:45 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
The Android Automerger [Fri, 15 Jul 2011 14:19:48 +0000 (07:19 -0700)]
HLK15
Change-Id: I4fe9536484604add3126a99539991e6d3c45f435
The Android Automerger [Fri, 15 Jul 2011 14:19:44 +0000 (07:19 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
Doug Kwan [Thu, 14 Jul 2011 23:34:26 +0000 (16:34 -0700)]
Conditionally disable -Wno-unused-but-set-variable for gcc-4.6.
We used to do that unconditionally but that caused lots of spurious
warnings in gcc-4.4.x about an unrecognized gcc option.
Change-Id: Idb5118b069871859e07a7efa04914ab6ed0b1372
Ying Wang [Thu, 14 Jul 2011 17:56:06 +0000 (10:56 -0700)]
am
8264e8f0: am
46db7b79: am
fbfd654f: Switch Unbundled apps from generic.mk to full.mk.
* commit '
8264e8f0f2a8ed2e4bfd5eb76934c6539c47fbc8':
Switch Unbundled apps from generic.mk to full.mk.
Ying Wang [Thu, 14 Jul 2011 16:18:31 +0000 (09:18 -0700)]
am
46db7b79: am
fbfd654f: Switch Unbundled apps from generic.mk to full.mk.
* commit '
46db7b791af1ec1d086f7dd73c737a79322e3e3e':
Switch Unbundled apps from generic.mk to full.mk.
The Android Automerger [Thu, 14 Jul 2011 14:20:34 +0000 (07:20 -0700)]
HLK14
Change-Id: I66abf43ce1ae0af8d08014cb5dabfddfe28f8010
The Android Automerger [Thu, 14 Jul 2011 14:20:29 +0000 (07:20 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
Ying Wang [Thu, 14 Jul 2011 05:38:35 +0000 (22:38 -0700)]
am
fbfd654f: Switch Unbundled apps from generic.mk to full.mk.
* commit '
fbfd654f67609d019de8111480ebe374669ffef2':
Switch Unbundled apps from generic.mk to full.mk.
Tsu Chiang Chuang [Wed, 13 Jul 2011 23:59:08 +0000 (16:59 -0700)]
Merge "fix mixing argument in makefile."
Tsu Chiang Chuang [Wed, 13 Jul 2011 23:40:33 +0000 (16:40 -0700)]
fix mixing argument in makefile.
Change-Id: I659d996dda0a2047ebb3240607e66411fc60fda6
android-merger [Wed, 13 Jul 2011 23:31:56 +0000 (16:31 -0700)]
GRJ90J
Change-Id: Ia1ca32f69dba721878e2190f8f841dda7aeb2055
David 'Digit' Turner [Wed, 13 Jul 2011 21:53:40 +0000 (14:53 -0700)]
am
d19750e8: (-s ours) am
36331f84: resolved conflicts for merge of
09636e17 to gingerbread-plus-aosp
* commit '
d19750e87f454507a9cee01989416ffbd14ea3f5': (23 commits)
sdk-addon.mk: Copy image files to ABI-specific dir
emulator: Enable dex-preoptimization
sdk: provide ABI-dependent atree files
emulator: Build emulator platform images as ARMv7-A
x86: Add proper gcc-4.4.3 x86 toolchain support.
sdk: Add pc-bios files for IA qemu emulator
x86: qemu emulator is the default build target
Add full_x86 product.
x86: sdk_x86 build target
Minor cleanup - DO NOT MERGE
Clean up full config - DO NOT MERGE
Make a full list of locales available
Truly default to the full config.
generic_x86 builds don't need/use the sparse ext4 format.
Use ext4 file system for generic_x86 userdata partition
GB Updates for init.rc and boot command line
Fix TARGET_PREBUILT_TAG so that get_build_var can retrieve the correct value across architectures
Display the TARGET_ARCH_VARIANT
Add generic_x86-eng to the lunch menu
Move buildspec vars to BoardConfig.mk
...
Ying Wang [Wed, 13 Jul 2011 21:30:30 +0000 (14:30 -0700)]
Merge "Use the LOCAL_* as dependency."
Ying Wang [Wed, 13 Jul 2011 21:29:33 +0000 (14:29 -0700)]
Use the LOCAL_* as dependency.
PRIVATE_* should be used only in the build commands.
Change-Id: Ie1d8db7c78012a8615b893d3ef3be893da7466f4
Eric Laurent [Wed, 13 Jul 2011 20:16:57 +0000 (13:16 -0700)]
Merge "Added webrtc audio processing library"
The Android Automerger [Wed, 13 Jul 2011 15:13:33 +0000 (08:13 -0700)]
HLK13
Change-Id: Ib4deb6215877d777476341cd8a21f26a74294acd
The Android Automerger [Wed, 13 Jul 2011 15:13:29 +0000 (08:13 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
Jean-Baptiste Queru [Wed, 13 Jul 2011 14:55:01 +0000 (07:55 -0700)]
Merge "Append the list of languages to the list of locales"
Eric Laurent [Wed, 13 Jul 2011 00:18:04 +0000 (17:18 -0700)]
Added webrtc audio processing library
Change-Id: I50d013b4d0de4a3abf3258f713617761bbd01199
android-merger [Tue, 12 Jul 2011 22:10:19 +0000 (15:10 -0700)]
GRJ90I - yet another test build
Change-Id: I6d4a87796b6483a9a1eb14839dac624e434b7089
Jeff Brown [Tue, 12 Jul 2011 19:11:36 +0000 (12:11 -0700)]
Merge "Remove the simulator target from all makefiles. Bug:
5010576"
android-merger [Tue, 12 Jul 2011 14:32:23 +0000 (07:32 -0700)]
GRJ90H - another testing
Change-Id: I4cf2dc09fa8076a7cdfda0449ab3785f7e9ecbfd
The Android Automerger [Tue, 12 Jul 2011 14:19:42 +0000 (07:19 -0700)]
HLK12
Change-Id: Ifc271bd0b913715c28ce8813c1f1d306d71f819f
The Android Automerger [Tue, 12 Jul 2011 14:19:35 +0000 (07:19 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
Jeff Brown [Tue, 12 Jul 2011 05:11:46 +0000 (22:11 -0700)]
Remove the simulator target from all makefiles.
Bug:
5010576
Change-Id: Ie814f4c8d3aa1e7cc7f5735822ab25542f36cf62
Eric Laurent [Tue, 12 Jul 2011 02:28:10 +0000 (19:28 -0700)]
Merge "Revert "Added webrtc audio processing library""
Eric Laurent [Tue, 12 Jul 2011 02:14:11 +0000 (19:14 -0700)]
Revert "Added webrtc audio processing library"
This reverts commit
14052b8db5fbc1da593b0a9b29ebb1a1848232ee
Eric Laurent [Tue, 12 Jul 2011 01:10:45 +0000 (18:10 -0700)]
Merge "Added webrtc audio processing library"
Scott Main [Tue, 12 Jul 2011 00:09:48 +0000 (17:09 -0700)]
am
7c32eeba: am
040221a9: am
1e03253b: Merge "docs: fix xss vulnerability bug
5008593" into honeycomb-mr2
* commit '
7c32eebac5bc5811f95bf2209ad80fcc6ebb550a':
docs: fix xss vulnerability bug
5008593
Jaikumar Ganesh [Tue, 12 Jul 2011 00:09:30 +0000 (17:09 -0700)]
am
981c1de4: am
eb0a62cb: (-s ours) am
b399f5e8: Merge "Rename health shared library."
* commit '
981c1de41a731bf7517f4604bfa351993462e986':
Rename health shared library.
David 'Digit' Turner [Mon, 11 Jul 2011 18:55:35 +0000 (11:55 -0700)]
am
36331f84: resolved conflicts for merge of
09636e17 to gingerbread-plus-aosp
* commit '
36331f8455822539fe4fbb0a25fbc377bbc80a89': (23 commits)
sdk-addon.mk: Copy image files to ABI-specific dir
emulator: Enable dex-preoptimization
sdk: provide ABI-dependent atree files
emulator: Build emulator platform images as ARMv7-A
x86: Add proper gcc-4.4.3 x86 toolchain support.
sdk: Add pc-bios files for IA qemu emulator
x86: qemu emulator is the default build target
Add full_x86 product.
x86: sdk_x86 build target
Minor cleanup - DO NOT MERGE
Clean up full config - DO NOT MERGE
Make a full list of locales available
Truly default to the full config.
generic_x86 builds don't need/use the sparse ext4 format.
Use ext4 file system for generic_x86 userdata partition
GB Updates for init.rc and boot command line
Fix TARGET_PREBUILT_TAG so that get_build_var can retrieve the correct value across architectures
Display the TARGET_ARCH_VARIANT
Add generic_x86-eng to the lunch menu
Move buildspec vars to BoardConfig.mk
...
David 'Digit' Turner [Mon, 11 Jul 2011 18:20:12 +0000 (20:20 +0200)]
resolved conflicts for merge of
09636e17 to gingerbread-plus-aosp
Change-Id: If2b21def45b5de222e560af442a0ff9f56da5a35
Ying Wang [Mon, 11 Jul 2011 16:57:08 +0000 (09:57 -0700)]
Switch Unbundled apps from generic.mk to full.mk.
Change-Id: Ib0b84e041275a5ad389a122f0349a85008496be2
Jean-Baptiste Queru [Mon, 11 Jul 2011 16:49:25 +0000 (09:49 -0700)]
Merge "Add PhotoEditor in AOSP builds"
The Android Automerger [Mon, 11 Jul 2011 14:21:08 +0000 (07:21 -0700)]
HLK11
Change-Id: I0b2c58dcfde3f50f0ec06e42a114b6b431b347d3
The Android Automerger [Mon, 11 Jul 2011 14:21:01 +0000 (07:21 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
android-merger [Mon, 11 Jul 2011 04:19:29 +0000 (21:19 -0700)]
GRJ90G - yes another test build
Change-Id: I75d42417e550e3e8007e83f474d2804375ddac70
android-merger [Sun, 10 Jul 2011 18:41:18 +0000 (11:41 -0700)]
GRJ90F
Change-Id: Ib4361e14ab7483a96a87923de1f7fe74572ecb25
Doug Kwan [Sat, 9 Jul 2011 01:47:25 +0000 (18:47 -0700)]
Disable gcc-4.6's Wunused-but-set-variables warning.
Change-Id: Ia02fa536410b9200beca1d9d120ec448c82e5ca8
Joe Malin [Sat, 9 Jul 2011 00:53:03 +0000 (17:53 -0700)]
am
dcca65cb: am
2c97d30f: am
8cf99f0c: DOC CHANGE: Change GTV icons for home page
* commit '
dcca65cb1d1ca1ae108b417ebd7241f397012b45':
DOC CHANGE: Change GTV icons for home page
Scott Main [Sat, 9 Jul 2011 00:45:38 +0000 (17:45 -0700)]
am
040221a9: am
1e03253b: Merge "docs: fix xss vulnerability bug
5008593" into honeycomb-mr2
* commit '
040221a9949c9f158cb7fc20b70b065289fcbbb1':
docs: fix xss vulnerability bug
5008593
Scott Main [Sat, 9 Jul 2011 00:44:08 +0000 (17:44 -0700)]
am
1e03253b: Merge "docs: fix xss vulnerability bug
5008593" into honeycomb-mr2
* commit '
1e03253bf263472ea0028d2518292beaf4cbe01a':
docs: fix xss vulnerability bug
5008593
Scott Main [Sat, 9 Jul 2011 00:42:40 +0000 (17:42 -0700)]
Merge "docs: fix xss vulnerability bug
5008593" into honeycomb-mr2
Scott Main [Fri, 8 Jul 2011 23:19:25 +0000 (16:19 -0700)]
docs: fix xss vulnerability
bug
5008593
the fix deletes some code that was originally there to handle side nav
highlighting for inter-doc links. This code is no longer necessary (or at least
should not be) because side nav links should not be inter-doc links, but
should always be to their own document (no two sidenav links should go
to separate sections of the same doc).
Change-Id: If77d6fe869e6a44bae2f194c9de26222e6ad9419
Jean-Baptiste Queru [Fri, 8 Jul 2011 23:19:42 +0000 (16:19 -0700)]
Add PhotoEditor in AOSP builds
Change-Id: If0a302701c4b6d2ebfb6b5dd6896d6717411553b
android-merger [Fri, 8 Jul 2011 22:46:13 +0000 (15:46 -0700)]
GRJ90E - more testing
Change-Id: I6bc1b5bc79b83d722f9915050c40d16ba1267be8
android-merger [Fri, 8 Jul 2011 19:16:35 +0000 (12:16 -0700)]
GRJ90D
Change-Id: I06e6933f75493c64cea797bca4e1a47edcc2fa94
Jaikumar Ganesh [Fri, 8 Jul 2011 19:12:14 +0000 (12:12 -0700)]
am
eb0a62cb: (-s ours) am
b399f5e8: Merge "Rename health shared library."
* commit '
eb0a62cb26d7bed289df823e2d68e422c39b5659':
Rename health shared library.
Jaikumar Ganesh [Fri, 8 Jul 2011 18:34:46 +0000 (11:34 -0700)]
am
b399f5e8: Merge "Rename health shared library."
* commit '
b399f5e81e2a644776f163e499df5bd0a38fe272':
Rename health shared library.
Jaikumar Ganesh [Fri, 8 Jul 2011 18:25:33 +0000 (11:25 -0700)]
Merge "Rename health shared library."
Jaikumar Ganesh [Fri, 8 Jul 2011 18:20:23 +0000 (11:20 -0700)]
Rename health shared library.
Change-Id: Ibd95333433bc2fb12322a9683bb3e0c0176dbce9
Joe Malin [Fri, 8 Jul 2011 17:38:37 +0000 (10:38 -0700)]
am
2c97d30f: am
8cf99f0c: DOC CHANGE: Change GTV icons for home page
* commit '
2c97d30fefed3430daa356418146d2cbb1f23c8f':
DOC CHANGE: Change GTV icons for home page
Jaikumar Ganesh [Fri, 8 Jul 2011 16:40:27 +0000 (09:40 -0700)]
Merge "Add Bluetooth health to the PRODUCT_PACKAGE."
Joe Malin [Fri, 8 Jul 2011 16:29:29 +0000 (09:29 -0700)]
am
8cf99f0c: DOC CHANGE: Change GTV icons for home page
* commit '
8cf99f0ccee8ecc95183f939d633a514e7eebdfb':
DOC CHANGE: Change GTV icons for home page
David 'Digit' Turner [Fri, 8 Jul 2011 16:19:01 +0000 (18:19 +0200)]
merge intel x86 patches into gingerbread branch
The Android Automerger [Fri, 8 Jul 2011 14:20:51 +0000 (07:20 -0700)]
HLK08
Change-Id: I1fdedea62d41405b4e16139c60c2f54ae0db45e5
The Android Automerger [Fri, 8 Jul 2011 14:20:45 +0000 (07:20 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
Jaikumar Ganesh [Fri, 8 Jul 2011 01:08:15 +0000 (18:08 -0700)]
Add Bluetooth health to the PRODUCT_PACKAGE.
Change-Id: Ifb668f74c09a321eea9d2785f7574cd637aff092
David 'Digit' Turner [Thu, 7 Jul 2011 23:56:51 +0000 (01:56 +0200)]
sdk-addon.mk: Copy image files to ABI-specific dir
Change-Id: I39ad022a5bb03ea39fc41c134d1d4855dc491deb
Jean-Baptiste Queru [Thu, 7 Jul 2011 22:48:04 +0000 (15:48 -0700)]
Merge "Add VideoEditor to full builds"
Jean-Baptiste Queru [Thu, 7 Jul 2011 22:30:15 +0000 (15:30 -0700)]
Add VideoEditor to full builds
Change-Id: Iaaecaa24b25c67642197d4926aa7f350991abf60
The Android Open Source Project [Thu, 7 Jul 2011 22:22:25 +0000 (15:22 -0700)]
Reconcile with gingerbread-release honeycomb-mr2-release honeycomb-LTE-release
Change-Id: I8ea53082a2a9d54a8004ff834d2344b989ca0fbf
David 'Digit' Turner [Wed, 15 Jun 2011 23:32:20 +0000 (01:32 +0200)]
emulator: Enable dex-preoptimization
Backport from AOSP master.
This enables the Dex pre-optimization for emulator-specific builds.
The idea is to speed up the initial boot sequence of an SDK AVD by
avoiding the costly on-device preopt pass that is performed otherwise
the first time the AVD is launched.
Benchmarking shows reductions in first boot time from 1m30s to 40s
on a 2.4GHz Xeon when emulating the AOSP master ToT.
Change-Id: Ibf5ebe68aa4d363c9df05d2ffe7cb828ef99f922
Orig-Change-Id: I67a9ce9791220c202817864c6e83dc8fd9cbc027
David 'Digit' Turner [Thu, 23 Jun 2011 10:49:02 +0000 (12:49 +0200)]
sdk: provide ABI-dependent atree files
Backport from AOSP master
This patch allows development/sdk/ to provide ABI-specific .atree
files. This is useful to copy prebuilt CPU model-specific files
to the SDK platform image directory.
This is needed to deal with the fact that for ARMv7 platform builds,
the kernel image to use is prebuilt/android-arm/kernel-qemu-armv7 instead
of prebuilt/android-arm/kernel/qemu
Change-Id: Ib76caa54a059eca2dafc9cdba812b29f98b5e3c3
Orig-Change-Id: Icdca751852c01421fccf196436a9bc1114ea90f7
David 'Digit' Turner [Wed, 15 Jun 2011 13:33:24 +0000 (15:33 +0200)]
emulator: Build emulator platform images as ARMv7-A
Backport from AOSP master.
Now that the emulator supports proper ARMv7 emulation, switch to
building all emulator-specific platform images using this instruction
set, in order to benefit from the noticeable speed boost provided by
Thumb-2 instructions.
Note that we don't build with NEON support because emulated NEON
instructions are currently slow, though they work.
IMPORTANT: You need to have the following emulator patch in your tree
in order to start these platform builds easily:
https://review.source.android.com//#change,23798
Otherwise, the alternative is to do these things:
1/ Telling the emulator to emulate an ARMv7-A CPU, instead of
an ARMv5TE one. This is normally done with "-qemu cortex-a8"
2/ Using an ARMv7-A capable kernel image, which is available and
usable with -kernel prebuilt/android-arm/kernel-qemu-armv7
Note that the emulator has a special hack that automatically enables
1/ if 2/ is being used (i.e. if the kernel image name ends with -armv7,
then emulate an ARMv7-A CPU automatically).
So in reality, only 2/ is required.
Change-Id: Id3ac7cdbda892e519af98aff1f02136f344406b8
Orig-Change-Id: I5c0245ba5e6a2bc34d0d49b2c024fffd317a5eed
OSDN Git Service
