OSDN Git Service
Vladimir Chtchetkine [Tue, 13 Dec 2011 22:39:12 +0000 (14:39 -0800)]
Merge "Add boot property enabling ADBD over QEMU"
Vladimir Chtchetkine [Tue, 13 Dec 2011 19:31:54 +0000 (11:31 -0800)]
Add boot property enabling ADBD over QEMU
Emulator and system image now support ADBD communication over QEMUD pipe rather
than over a TCP port forwarding. However, emulator has to know ahead of time
(before system starts booting) whether or not the system image supports ADBD
over pipe to properly setup the communication. For that, we introduce a boot
property "ro.adb.qemu" that is readable by the emulator early enough for the
proper ADB communication setup.
Change-Id: I978489c5acf46177b520e775d745bcc78f469837
Sean Dykeman [Tue, 13 Dec 2011 01:42:55 +0000 (17:42 -0800)]
Make java-event-log-tags.py create its output directory if it does not exist.
Change-Id: I88ca3e6e70d1ff9db8f1328f18c36abc196e1aad
Ying Wang [Tue, 13 Dec 2011 17:06:08 +0000 (09:06 -0800)]
Merge "Allow to build Java module from mere static Java libraries."
The Android Open Source Project [Tue, 13 Dec 2011 13:40:51 +0000 (05:40 -0800)]
am
d2884199: Reconcile with ics-mr1-release
* commit '
d2884199bda058c13e79f01e9ece26c0334d1d9c':
IML73
The Android Open Source Project [Tue, 13 Dec 2011 13:11:37 +0000 (05:11 -0800)]
Reconcile with ics-mr1-release
Change-Id: I4e8279a5f59137d2ec2add324d117701ade68a8c
The Android Automerger [Tue, 13 Dec 2011 06:11:29 +0000 (22:11 -0800)]
IML73
The Android Automerger [Tue, 13 Dec 2011 06:07:51 +0000 (22:07 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Jean-Baptiste Queru [Tue, 13 Dec 2011 02:01:28 +0000 (18:01 -0800)]
am
a2c1261e: (-s ours) Set version numbers for AOSP - do not merge
* commit '
a2c1261e719b4fbac9eee4e348b629360870468f':
Set version numbers for AOSP - do not merge
Ying Wang [Tue, 13 Dec 2011 01:52:03 +0000 (17:52 -0800)]
Allow to build Java module from mere static Java libraries.
With this change, we can easily turn a static Java library to a shared
Java library.
Change-Id: I9915992cd19879846511d6272483d7a0a934e7eb
Jesse Hall [Tue, 13 Dec 2011 01:49:18 +0000 (17:49 -0800)]
am
055cf585: am
615d2ffa: Enable the OpenGL View renderer on the emulator
* commit '
055cf585b567af6ced36d7227a2ae921df5782e0':
Enable the OpenGL View renderer on the emulator
Ying Wang [Tue, 13 Dec 2011 01:32:22 +0000 (17:32 -0800)]
Merge "Restrict vendor modules to help AOSP product distribution."
Jean-Baptiste Queru [Tue, 13 Dec 2011 01:16:07 +0000 (17:16 -0800)]
Set version numbers for AOSP - do not merge
Change-Id: I7be67f46069ed758e67066e696aa2567983fa374
The Android Open Source Project [Mon, 12 Dec 2011 23:39:11 +0000 (15:39 -0800)]
am
cd197842: Reconcile with ics-mr1-release
* commit '
cd197842b6b17c16b01b0f3608f7177faa5ab505':
IML70C
IML70B
Bruce Beare [Mon, 12 Dec 2011 23:39:05 +0000 (15:39 -0800)]
am
38158161: am
3343b27c: x86: The default ATOM BSP flags need to be in sync with the NDK ABI
* commit '
381581613aab988acc6f9d5b459fd4f533d8c2a5':
x86: The default ATOM BSP flags need to be in sync with the NDK ABI
The Android Open Source Project [Mon, 12 Dec 2011 23:29:48 +0000 (15:29 -0800)]
am
e7a33465: Reconcile with ics-mr1-release
* commit '
e7a33465ac64218e146d72b2af0fd3a862128be1':
IML70
IML69C
IML69B
Jesse Hall [Mon, 12 Dec 2011 23:22:32 +0000 (15:22 -0800)]
am
615d2ffa: Enable the OpenGL View renderer on the emulator
* commit '
615d2ffa926d03ba44fbc58b4593ce96ef831783':
Enable the OpenGL View renderer on the emulator
Ying Wang [Fri, 9 Dec 2011 23:11:57 +0000 (15:11 -0800)]
Restrict vendor modules to help AOSP product distribution.
Bug:
5692177
If you set "PRODUCT_RESTRICT_VENDOR_FILES := true" in a product
configuration, this changes restricts that:
- No overlays in the vendor tree.
- No PRODUCT_COPY_FILES coming from the vendor tree.
- Any referenced package with Android.mk in the vendor tree must have
LOCAL_MODULE_OWNER set to a value that's compared against a whitelist
stored in the core build system.
Change-Id: I172b84c7c853e9a04bf9879ea8dec90bd5054230
Jesse Hall [Thu, 1 Dec 2011 19:45:49 +0000 (11:45 -0800)]
Enable the OpenGL View renderer on the emulator
If the emulator is run without GL acceleration enabled, the OpenGL
renderer will disable itself at runtime.
Change-Id: Ie40c7895120f51bb6a817c2f3cf7fab0a3dda292
The Android Open Source Project [Mon, 12 Dec 2011 14:50:16 +0000 (06:50 -0800)]
Reconcile with ics-mr1-release
Change-Id: I623e25d55ed00b150729425f710ca52af2de7913
The Android Automerger [Sun, 11 Dec 2011 05:35:46 +0000 (21:35 -0800)]
IML70C
Bruce Beare [Sat, 10 Dec 2011 00:21:00 +0000 (16:21 -0800)]
am
3343b27c: x86: The default ATOM BSP flags need to be in sync with the NDK ABI
* commit '
3343b27c534fb4ea238f2feaa0d9346840ee2f92':
x86: The default ATOM BSP flags need to be in sync with the NDK ABI
The Android Automerger [Sat, 10 Dec 2011 00:19:55 +0000 (16:19 -0800)]
IML70B
The Android Automerger [Sat, 10 Dec 2011 00:15:20 +0000 (16:15 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
The Android Open Source Project [Fri, 9 Dec 2011 22:58:03 +0000 (14:58 -0800)]
The Android Open Source Project [Fri, 9 Dec 2011 22:57:25 +0000 (14:57 -0800)]
am
374011a7: (-s ours) Reconcile with ics-mr0-release ics-mr1-release
* commit '
374011a72ef62b2381235f07fb9117fbb03f12c7':
IML69
ICL53F
IML67B
Kenny Root [Fri, 9 Dec 2011 22:10:22 +0000 (14:10 -0800)]
Merge "Use ARM TLS register for emulator"
Bruce Beare [Fri, 9 Dec 2011 21:27:08 +0000 (13:27 -0800)]
x86: The default ATOM BSP flags need to be in sync with the NDK ABI
Change-Id: Ic741e1795c655ace1e33ae6708219f2708358090
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
The Android Open Source Project [Fri, 9 Dec 2011 15:10:41 +0000 (07:10 -0800)]
Reconcile with ics-mr1-release
Change-Id: I7267a0f90aad28d4698b6c7ebd0e69e9dcd6ade6
The Android Automerger [Fri, 9 Dec 2011 14:59:51 +0000 (06:59 -0800)]
IML70
The Android Automerger [Fri, 9 Dec 2011 14:57:15 +0000 (06:57 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Fri, 9 Dec 2011 01:37:41 +0000 (17:37 -0800)]
IML69C
The Android Automerger [Fri, 9 Dec 2011 01:34:09 +0000 (17:34 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Thu, 8 Dec 2011 19:30:49 +0000 (11:30 -0800)]
IML69B
The Android Open Source Project [Thu, 8 Dec 2011 18:27:13 +0000 (10:27 -0800)]
am
91789538: Reconcile with ics-mr0-release
* commit '
917895384fb7c9fb9ca858fdf792ec165e151de9':
The Android Open Source Project [Thu, 8 Dec 2011 18:25:56 +0000 (10:25 -0800)]
Reconcile with ics-mr0-release
Change-Id: I7b413162b41b52be626b4ebc5c3f3ea37fdc6288
The Android Open Source Project [Thu, 8 Dec 2011 18:21:25 +0000 (10:21 -0800)]
Reconcile with ics-mr0-release ics-mr1-release
Change-Id: I7bc70364e017d1c67bcc4b308e0aff5eaa19e661
Kenny Root [Thu, 8 Dec 2011 00:55:15 +0000 (16:55 -0800)]
Use ARM TLS register for emulator
This is dependent on having a kernel that uses CONFIG_HAS_TLS_REG=y
which is enabled in change Ic497e41270a4ad78ca55ab5674b5342e8d939e56
Change-Id: I456c270dd5b4d8fedfb423ac8e363fd37b77f8ce
The Android Automerger [Thu, 8 Dec 2011 15:03:55 +0000 (07:03 -0800)]
IML69
The Android Automerger [Thu, 8 Dec 2011 14:59:23 +0000 (06:59 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Stephen Hines [Thu, 8 Dec 2011 01:26:25 +0000 (17:26 -0800)]
Merge "Enable -Wall/-Werror with LOCAL_RENDERSCRIPT_FLAGS."
The Android Automerger [Thu, 8 Dec 2011 00:42:26 +0000 (16:42 -0800)]
ICL53F
Stephen Hines [Wed, 7 Dec 2011 02:43:24 +0000 (18:43 -0800)]
Enable -Wall/-Werror with LOCAL_RENDERSCRIPT_FLAGS.
Change-Id: Ia2a058e6711839d89072c2e96f0c60aa4cedda6b
The Android Automerger [Wed, 7 Dec 2011 19:15:49 +0000 (11:15 -0800)]
IML67B
Dianne Hackborn [Wed, 7 Dec 2011 18:46:20 +0000 (10:46 -0800)]
resolved conflicts for merge of
d7b15982 to master
Change-Id: Iaa744477dd64e9833888f72186ec0676e99f28e4
Dianne Hackborn [Wed, 7 Dec 2011 18:34:21 +0000 (10:34 -0800)]
am
e73b24cc: Did I say 4.1? Oh well what I *really* meant was 4.0.3, of course.
* commit '
e73b24ccbe728476e5bc77aaf2fd6865276cacc3':
Did I say 4.1? Oh well what I *really* meant was 4.0.3, of course.
Dianne Hackborn [Tue, 6 Dec 2011 02:14:12 +0000 (18:14 -0800)]
Did I say 4.1? Oh well what I *really* meant was 4.0.3, of course.
Change-Id: I61ccc290aec8fa7e2e68cf01bc920a65b8b9e246
The Android Open Source Project [Wed, 7 Dec 2011 15:44:22 +0000 (07:44 -0800)]
Reconcile with ics-mr1-release
Change-Id: Ib6c72245d2135fe255c5dada01754cb5e03d761c
The Android Open Source Project [Wed, 7 Dec 2011 15:27:54 +0000 (07:27 -0800)]
am
e3bdf69c: am
febd861a: Reconcile with ics-mr0-release
* commit '
e3bdf69cc6af9a7deec5a44823e5a0a2e1f16064':
ICL53E
The Android Open Source Project [Wed, 7 Dec 2011 15:26:16 +0000 (07:26 -0800)]
am
febd861a: Reconcile with ics-mr0-release
* commit '
febd861a073b0500b6e7f0ea117b71df3bc6822c':
ICL53E
The Android Open Source Project [Wed, 7 Dec 2011 15:24:51 +0000 (07:24 -0800)]
Reconcile with ics-mr0-release
Change-Id: Ifdc1b145e1f778260a1445c954ea2e7848e67c19
Jean-Baptiste Queru [Wed, 7 Dec 2011 06:53:45 +0000 (22:53 -0800)]
am
0cd997ff: am
8af0efd6: Improve handling of absolute paths in out directory
* commit '
0cd997ff31852af80eab4f3d0c2db8d1a1328085':
Improve handling of absolute paths in out directory
Jean-Baptiste Queru [Wed, 7 Dec 2011 06:53:44 +0000 (22:53 -0800)]
am
78b68045: am
ffe03c98: Set OUT_DIR based on a common base path
* commit '
78b680458b3ba53fb2f88a603e371c002eb8944b':
Set OUT_DIR based on a common base path
Jean-Baptiste Queru [Wed, 7 Dec 2011 03:32:38 +0000 (19:32 -0800)]
am
8af0efd6: Improve handling of absolute paths in out directory
* commit '
8af0efd6a157e682d88c9a6e030f37bab9860caf':
Improve handling of absolute paths in out directory
Jean-Baptiste Queru [Wed, 7 Dec 2011 03:32:37 +0000 (19:32 -0800)]
am
ffe03c98: Set OUT_DIR based on a common base path
* commit '
ffe03c984b2836a9b4e4ddb5a17ec0dd26ba686c':
Set OUT_DIR based on a common base path
The Android Automerger [Wed, 7 Dec 2011 00:56:46 +0000 (16:56 -0800)]
IML67
The Android Automerger [Wed, 7 Dec 2011 00:53:04 +0000 (16:53 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Jean-Baptiste Queru [Wed, 7 Dec 2011 00:32:40 +0000 (16:32 -0800)]
Improve handling of absolute paths in out directory
Change-Id: If6b320e274fb1cee33808424246ce2c88b9b7ef5
Jean-Baptiste Queru [Tue, 6 Dec 2011 18:29:46 +0000 (10:29 -0800)]
Set OUT_DIR based on a common base path
Change-Id: I2c4ba8b101d4d186ed4b371b9d07b3bcf75bbcc9
Author: Jean-Baptiste Queru<jbq@google.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
The Android Automerger [Tue, 6 Dec 2011 22:23:43 +0000 (14:23 -0800)]
ICL53E
The Android Open Source Project [Tue, 6 Dec 2011 17:02:50 +0000 (09:02 -0800)]
Reconcile with ics-mr1-release
Change-Id: Ib87b7762bfc1eca5386bfc50c687547c6141dc29
The Android Open Source Project [Tue, 6 Dec 2011 17:00:17 +0000 (09:00 -0800)]
am
da4a1fc2: am
aac7b445: Reconcile with ics-mr0-release
* commit '
da4a1fc216429a44c1befaf27f73350af2527a67':
ICL53D
The Android Open Source Project [Tue, 6 Dec 2011 16:57:52 +0000 (08:57 -0800)]
am
aac7b445: Reconcile with ics-mr0-release
* commit '
aac7b4455a4dbfab5a136628864789eba8a31bb0':
ICL53D
The Android Open Source Project [Tue, 6 Dec 2011 16:56:01 +0000 (08:56 -0800)]
Reconcile with ics-mr0-release
Change-Id: I224ac8e665f91c64935f7a20397b925aba767994
The Android Automerger [Tue, 6 Dec 2011 13:23:26 +0000 (05:23 -0800)]
ICL53D
The Android Automerger [Tue, 6 Dec 2011 04:38:05 +0000 (20:38 -0800)]
IML66
The Android Automerger [Tue, 6 Dec 2011 04:34:59 +0000 (20:34 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
The Android Open Source Project [Mon, 5 Dec 2011 16:52:52 +0000 (08:52 -0800)]
Reconcile with ics-mr1-release
Change-Id: Ia3ed1074e701cb1a74e3af1906ef3897fc293fd0
Doug Zongker [Sat, 3 Dec 2011 01:57:22 +0000 (17:57 -0800)]
am
4eef1296: am
bd2dadc2: check entire recovery partition on startup
* commit '
4eef12965b5dc39ba87eb71ac3548cc2ec8af729':
check entire recovery partition on startup
The Android Automerger [Sat, 3 Dec 2011 00:23:13 +0000 (16:23 -0800)]
IML63B
The Android Automerger [Sat, 3 Dec 2011 00:20:17 +0000 (16:20 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Doug Zongker [Fri, 2 Dec 2011 21:58:08 +0000 (13:58 -0800)]
am
bd2dadc2: check entire recovery partition on startup
* commit '
bd2dadc21a5db967972a7b8f81aad716609edacb':
check entire recovery partition on startup
Doug Zongker [Fri, 2 Dec 2011 18:46:59 +0000 (10:46 -0800)]
check entire recovery partition on startup
Checksum the entire recovery partition at boot time to see if we need
to rewrite it, rather than just the first 2kb.
Bug:
5668350
Change-Id: I777754f92e8da630ae3c09bb0d4c41884ff62f39
Doug Zongker [Fri, 2 Dec 2011 21:39:33 +0000 (13:39 -0800)]
Merge "check entire recovery partition on startup"
Doug Zongker [Fri, 2 Dec 2011 18:46:59 +0000 (10:46 -0800)]
check entire recovery partition on startup
Checksum the entire recovery partition at boot time to see if we need
to rewrite it, rather than just the first 2kb.
Bug:
5668350
Change-Id: I777754f92e8da630ae3c09bb0d4c41884ff62f39
Ying Wang [Fri, 2 Dec 2011 18:34:45 +0000 (10:34 -0800)]
Print more info of the image size stats.
Bug:
5620615
Before this change it only reports the limit if the real size exceeeds
or approaches the limit.
Change-Id: Ie1737d6ba2dc2d57ad82c487990e109882526d6e
The Android Automerger [Fri, 2 Dec 2011 18:27:28 +0000 (10:27 -0800)]
IML63
The Android Automerger [Fri, 2 Dec 2011 18:24:07 +0000 (10:24 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
The Android Open Source Project [Fri, 2 Dec 2011 15:52:56 +0000 (07:52 -0800)]
Reconcile with ics-mr1-release
Change-Id: I7652f038082b7a8de4a210854f755c3127f3370a
Scott Main [Fri, 2 Dec 2011 04:44:25 +0000 (20:44 -0800)]
am
d34204b9: am
b83d8f15: am
f5cbe002: Merge "docs: update template and css for android u Add a custom version of docpage.cs to the droiddoc template, because it adds a good deal of custom design and behavior (instead of updating the doclava version of the file). Add
* commit '
d34204b9ec3e79862f5101837ccc6f90909b9850':
docs: update template and css for android u Add a custom version of docpage.cs to the droiddoc template, because it adds a good deal of custom design and behavior (instead of updating the doclava version of the file). Add CSS for next/previous links in android u lessons and revise style for download button.
Scott Main [Fri, 2 Dec 2011 04:42:55 +0000 (20:42 -0800)]
am
b83d8f15: am
f5cbe002: Merge "docs: update template and css for android u Add a custom version of docpage.cs to the droiddoc template, because it adds a good deal of custom design and behavior (instead of updating the doclava version of the file). Add CSS for next/
* commit '
b83d8f15ccc276b190a6c02002f6af94aa2e9cb4':
docs: update template and css for android u Add a custom version of docpage.cs to the droiddoc template, because it adds a good deal of custom design and behavior (instead of updating the doclava version of the file). Add CSS for next/previous links in android u lessons and revise style for download button.
Scott Main [Fri, 2 Dec 2011 04:40:59 +0000 (20:40 -0800)]
am
f5cbe002: Merge "docs: update template and css for android u Add a custom version of docpage.cs to the droiddoc template, because it adds a good deal of custom design and behavior (instead of updating the doclava version of the file). Add CSS for next/previous link
* commit '
f5cbe0024328f6d716dc13b8a836f058c9c74c64':
docs: update template and css for android u Add a custom version of docpage.cs to the droiddoc template, because it adds a good deal of custom design and behavior (instead of updating the doclava version of the file). Add CSS for next/previous links in android u lessons and revise style for download button.
Scott Main [Fri, 2 Dec 2011 04:39:29 +0000 (20:39 -0800)]
Merge "docs: update template and css for android u Add a custom version of docpage.cs to the droiddoc template, because it adds a good deal of custom design and behavior (instead of updating the doclava version of the file). Add CSS for next/previous links in android u lessons and revise style for download button." into ics-mr0
The Android Automerger [Fri, 2 Dec 2011 00:47:38 +0000 (16:47 -0800)]
IML62B
The Android Automerger [Fri, 2 Dec 2011 00:45:02 +0000 (16:45 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Thu, 1 Dec 2011 14:48:19 +0000 (06:48 -0800)]
IML62
The Android Automerger [Thu, 1 Dec 2011 14:45:22 +0000 (06:45 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Scott Main [Thu, 1 Dec 2011 02:55:01 +0000 (18:55 -0800)]
docs: update template and css for android u
Add a custom version of docpage.cs to the droiddoc template, because
it adds a good deal of custom design and behavior (instead of updating
the doclava version of the file). Add CSS for next/previous links in
android u lessons and revise style for download button.
Change-Id: I829c4fb134d6f5c3cee82fb86958d23ef64e8481
The Android Automerger [Thu, 1 Dec 2011 00:59:51 +0000 (16:59 -0800)]
IML61B
Alon Albert [Wed, 30 Nov 2011 21:04:32 +0000 (13:04 -0800)]
Merge "Add support for building specific modules with mmm using the following syntax: Build all modules: mmm dir Build a single module: mmm dir:module Build multiple modules: mmm dir:module1,module2 Or in other words:"
The Android Open Source Project [Wed, 30 Nov 2011 20:55:27 +0000 (12:55 -0800)]
Reconcile with ics-mr1-release
Change-Id: I91cfa5357d3530b04123a4faf703598994b2ed5a
Alon Albert [Wed, 30 Nov 2011 20:40:19 +0000 (12:40 -0800)]
Add support for building specific modules with mmm using the following syntax:
Build all modules: mmm dir
Build a single module: mmm dir:module
Build multiple modules: mmm dir:module1,module2
Or in other words:
Change-Id: If32770c19f03a4d460f32046a3dd06656e33ee11
Marius Renn [Wed, 30 Nov 2011 18:51:17 +0000 (10:51 -0800)]
am
f945235a: am
72db32c7: Merge "Google Add-On API Documentation Fixes (
5429077)" into ics-mr1
* commit '
f945235a8adc6b163a0e46941791bb305ef37034':
Google Add-On API Documentation Fixes (
5429077)
Jean-Baptiste Queru [Wed, 30 Nov 2011 18:51:12 +0000 (10:51 -0800)]
am
8dd412a9: Merge from AOSP
* commit '
8dd412a900c73144b0d868e3e872938052071d95':
English must be the first language specified
Marius Renn [Wed, 30 Nov 2011 17:53:05 +0000 (09:53 -0800)]
am
72db32c7: Merge "Google Add-On API Documentation Fixes (
5429077)" into ics-mr1
* commit '
72db32c744744ae1ace26830ecce968b6a95e173':
Google Add-On API Documentation Fixes (
5429077)
Marius Renn [Wed, 30 Nov 2011 17:51:17 +0000 (09:51 -0800)]
Merge "Google Add-On API Documentation Fixes (
5429077)" into ics-mr1
Jean-Baptiste Queru [Wed, 30 Nov 2011 15:26:18 +0000 (07:26 -0800)]
Merge from AOSP
Change-Id: I992d4a0baefc08e105f76b7e6f6950516047670a
The Android Automerger [Wed, 30 Nov 2011 14:48:37 +0000 (06:48 -0800)]
IML61
The Android Automerger [Wed, 30 Nov 2011 14:45:15 +0000 (06:45 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Wed, 30 Nov 2011 01:08:24 +0000 (17:08 -0800)]
IML60C