OSDN Git Service
Glenn Kasten [Mon, 19 Dec 2011 16:07:56 +0000 (08:07 -0800)]
Merge "Add libaudioutils"
Ying Wang [Sat, 17 Dec 2011 01:00:46 +0000 (17:00 -0800)]
Merge "Collect the GPL source files."
Glenn Kasten [Fri, 16 Dec 2011 23:34:57 +0000 (15:34 -0800)]
Add libaudioutils
Change-Id: I8fe062e4a78d8db1ce0612bf7cb58dc021925810
Ying Wang [Fri, 16 Dec 2011 19:27:52 +0000 (11:27 -0800)]
Support to build factory ramdisk image.
Bug:
5769921
With this change, to build factory_ramdisk.img, set
PRODUCT_FACTORY_RAMDISK_MODULES in your product config.
PRODUCT_FACTORY_RAMDISK_MODULES consists of
"<module_name>:<install_path>" pairs.
<install_path> is relative to the root of the factory ramdisk output.
For example:
PRODUCT_FACTORY_RAMDISK_MODULES := \
toolbox:bin/toolbox adbd:sbin/adbd adb:bin/adb
On the other hand you can use PRODUCT_COPY_FILES to copy prebuilt files
to the factory ramdisk.
Or you can define modules that are specific for the factory ramdisk
(with LOCAL_MODULE_PATH pointing to TARGET_FACTORY_RAMDISK_OUT) and add
the module names to PRODUCT_PACKAGES.
Change-Id: I80ff72606415cd74fe6f3bc93020a05d84e45b70
Ying Wang [Fri, 16 Dec 2011 21:52:26 +0000 (13:52 -0800)]
Merge "Print out ignored PRODUCT_COPY_FILES"
Brian Muramatsu [Fri, 16 Dec 2011 21:07:15 +0000 (13:07 -0800)]
Stop Building CTS VM Tests
Bug
5728172
The VM tests were used with the old test runner.
Change-Id: I7ba819a394bb9643f937240ebd315d7d7820a8bf
Ying Wang [Fri, 16 Dec 2011 19:54:25 +0000 (11:54 -0800)]
Print out ignored PRODUCT_COPY_FILES
So that people know their files are not really copied in accident.
Change-Id: I8fab920483230a9f349304dcbdb2fb9d60ee0215
Kenny Root [Fri, 16 Dec 2011 17:27:16 +0000 (09:27 -0800)]
Merge "Unset HAVE_TLS_REGISTER for ARMv5"
The Android Open Source Project [Fri, 16 Dec 2011 16:09:52 +0000 (08:09 -0800)]
am
6c2c5d8e: Reconcile with ics-mr1-release
* commit '
6c2c5d8eec5e140ebedee7330988015df6aeb8bc':
IML74K
IML74J
IML74I
IML74H
IML75
The Android Open Source Project [Fri, 16 Dec 2011 16:07:59 +0000 (08:07 -0800)]
Reconcile with ics-mr1-release
Change-Id: I4efd2763f8ae4da60277edc110ff8649869a35e7
The Android Automerger [Fri, 16 Dec 2011 08:15:10 +0000 (00:15 -0800)]
IML74K
The Android Automerger [Fri, 16 Dec 2011 05:43:32 +0000 (21:43 -0800)]
IML74J
The Android Automerger [Fri, 16 Dec 2011 04:50:23 +0000 (20:50 -0800)]
IML74I
The Android Automerger [Fri, 16 Dec 2011 04:49:52 +0000 (20:49 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Fri, 16 Dec 2011 04:18:19 +0000 (20:18 -0800)]
IML74H
Scott Main [Fri, 16 Dec 2011 04:12:50 +0000 (20:12 -0800)]
am
96f696d9: am
c4e8801c: am
50d6f97c: docs: revise space wrapping to avoid "new" tags from breaking new lines alone Temp fix
* commit '
96f696d90176b53c6902455b270960dd88ca1c1a':
docs: revise space wrapping to avoid "new" tags from breaking new lines alone Temp fix
Scott Main [Fri, 16 Dec 2011 04:10:46 +0000 (20:10 -0800)]
am
c4e8801c: am
50d6f97c: docs: revise space wrapping to avoid "new" tags from breaking new lines alone Temp fix
* commit '
c4e8801c2d059aa68e59069c5cc03adb2d464e6b':
docs: revise space wrapping to avoid "new" tags from breaking new lines alone Temp fix
Scott Main [Fri, 16 Dec 2011 04:09:04 +0000 (20:09 -0800)]
am
50d6f97c: docs: revise space wrapping to avoid "new" tags from breaking new lines alone Temp fix
* commit '
50d6f97c46934014894a43d3610029f579145713':
docs: revise space wrapping to avoid "new" tags from breaking new lines alone Temp fix
Scott Main [Fri, 16 Dec 2011 04:06:32 +0000 (20:06 -0800)]
docs: revise space wrapping to avoid "new" tags from breaking new lines alone
Temp fix
Change-Id: If99ce3442ec179a46fe3bbe0a06f690527d05eb5
Scott Main [Fri, 16 Dec 2011 03:18:24 +0000 (19:18 -0800)]
am
a9255cfa: am
0af80fb4: am
0f429ebe: docs: fix bug in script for tab cookies
* commit '
a9255cfa7c4b352b730ade2ea5cf3096f9512845':
docs: fix bug in script for tab cookies
Scott Main [Fri, 16 Dec 2011 03:16:13 +0000 (19:16 -0800)]
am
0af80fb4: am
0f429ebe: docs: fix bug in script for tab cookies
* commit '
0af80fb409708d86b360e842bc834b3cbe4bc443':
docs: fix bug in script for tab cookies
Scott Main [Fri, 16 Dec 2011 03:14:31 +0000 (19:14 -0800)]
am
0f429ebe: docs: fix bug in script for tab cookies
* commit '
0f429ebe63acbf8ccc1efe3c4185151eb15a4783':
docs: fix bug in script for tab cookies
Scott Main [Fri, 16 Dec 2011 03:12:17 +0000 (19:12 -0800)]
docs: fix bug in script for tab cookies
Change-Id: I09a49764f66673b3f55032158efd44c228832e8f
Scott Main [Fri, 16 Dec 2011 01:41:49 +0000 (17:41 -0800)]
am
b90afc2c: am
9839afdd: am
1d42360a: docs: style and script changes for android u classes
* commit '
b90afc2cf008fac3f63e721de7ef0a64f8e815b1':
docs: style and script changes for android u classes
Scott Main [Fri, 16 Dec 2011 01:39:41 +0000 (17:39 -0800)]
am
9839afdd: am
1d42360a: docs: style and script changes for android u classes
* commit '
9839afddfcade4db1989718216b592aed76e73e7':
docs: style and script changes for android u classes
Scott Main [Fri, 16 Dec 2011 01:37:35 +0000 (17:37 -0800)]
am
1d42360a: docs: style and script changes for android u classes
* commit '
1d42360a028b2d55f6d4d29bd99e8ef3de6e8402':
docs: style and script changes for android u classes
Scott Main [Fri, 16 Dec 2011 01:34:40 +0000 (17:34 -0800)]
docs: style and script changes for android u classes
Change-Id: I5866541bb9dd41329aa02328b805959c8f675f8c
Ying Wang [Fri, 16 Dec 2011 00:36:55 +0000 (16:36 -0800)]
Remove the R/Manifest classes when building the static Java library
Bug:
5448433
Instead of deferring the removal to building the app.
In that case any R/Manifest classes in any static Java libraries will be
deleted, no matter if they are generated from Android resource, or just
source R.java/Manifest.java in the source tree by accident.
Change-Id: I656f45e3cbc3796c5d4832363231480b3f1dc5b8
Ying Wang [Thu, 15 Dec 2011 23:10:04 +0000 (15:10 -0800)]
Don't remove R class to fix the build.
Unfortunately there is R.java checked in the source tree that gets built
into static library.
So we have to find a way to delete classes from R.java generated by the
build system on the fly.
Change-Id: I2d82d28234cecbf6dd5b02b2dd4f7dbd47e3b626
Ying Wang [Thu, 15 Dec 2011 22:34:32 +0000 (14:34 -0800)]
Merge "Support to build static Java library with Android resource"
Conley Owens [Thu, 15 Dec 2011 18:57:32 +0000 (10:57 -0800)]
Merge "Add several module owners to the whitelist"
Kenny Root [Thu, 15 Dec 2011 18:30:13 +0000 (10:30 -0800)]
Unset HAVE_TLS_REGISTER for ARMv5
Bug:
5763261
Change-Id: I0394daa4cdbad598b91a99e54ca5f830e9ee940b
Conley Owens [Thu, 15 Dec 2011 18:24:26 +0000 (10:24 -0800)]
Add several module owners to the whitelist
Change-Id: I9a215b74167efc2a6b3070dc8b616a289669d10f
The Android Automerger [Thu, 15 Dec 2011 06:16:29 +0000 (22:16 -0800)]
IML75
The Android Automerger [Thu, 15 Dec 2011 06:13:33 +0000 (22:13 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
The Android Open Source Project [Thu, 15 Dec 2011 03:58:49 +0000 (19:58 -0800)]
am
c7185534: Reconcile with ics-mr1-release
* commit '
c7185534d323aa13af3bda77a2e0e232306be89a':
IML74G
The Android Open Source Project [Thu, 15 Dec 2011 03:57:24 +0000 (19:57 -0800)]
Reconcile with ics-mr1-release
Change-Id: I13575fbc40df854f574e7eaf8cfee6153ab3a342
The Android Automerger [Thu, 15 Dec 2011 03:28:43 +0000 (19:28 -0800)]
IML74G
The Android Open Source Project [Thu, 15 Dec 2011 00:06:54 +0000 (16:06 -0800)]
am
efe3034c: Reconcile with ics-mr1-release
* commit '
efe3034c7107f80e99016bf1808cdfe1afe03e31':
IML74F
IML74E
The Android Open Source Project [Thu, 15 Dec 2011 00:05:28 +0000 (16:05 -0800)]
Reconcile with ics-mr1-release
Change-Id: I93d6301506cdc1b3f549b7cf4dbc8a8b3adeca2b
Ying Wang [Wed, 14 Dec 2011 22:29:28 +0000 (14:29 -0800)]
Support to build static Java library with Android resource
Bug:
5714516
The rationale behind this change:
- the library is compiled into a jar file, but its R class is generated
making the constant not constant (static, not final static) (aapt
option --non-constant-id). Also the jar file does not contain the R
class.
- this allows the integer value to not be inlined in the compiled
class files. Note that this prevents using switch statements.
- the main project use this jar file as a normal static library: it will
add all the class files except the R.class.
- the main project uses the library res folder as a resource
folder with lower priority than the main project (basically the
main project is an overlay. This is accomplished using aapt's
--auto-add-overlay to handle resources only in the main project
(which the normal overlay mechanism doesn't allow).
- the main project creates R classes in the main project's
package but also in the library's package. This is done with
aapt's --extra-packages which accept as many packages as
needed, separated by a :.
- manifest merging is not done yet, so
activities/services/permissions/etc... have to be manually declared in
the main app.
To use a static library with Android resource in your app,
1. Add the library's resource dir to your app as an overlay:
LOCAL_RESOURCE_DIR := <app_resource_dir> <static_library_resource_dirs>
2. Set the proper aapt flags:
LOCAL_AAPT_FLAGS := <apps_own_flags> --auto-add-overlay \
--extra-packages <lib1_package_name>:<lib2_package_name>:...
Change-Id: Ifb4d2300b952ea4aaee74da1bb0c6c72ea0698a3
The Android Automerger [Wed, 14 Dec 2011 23:56:03 +0000 (15:56 -0800)]
IML74F
The Android Automerger [Wed, 14 Dec 2011 23:44:48 +0000 (15:44 -0800)]
IML74E
Brian Muramatsu [Wed, 14 Dec 2011 23:39:46 +0000 (15:39 -0800)]
resolved conflicts for merge of
80fa947b to master
Change-Id: I0febb15b690932ad342da4b10eb9c0f13d1d1517
Brian Muramatsu [Wed, 14 Dec 2011 23:33:22 +0000 (15:33 -0800)]
am
fea66cee: Merge "Build Support for CTS Native Tests" into ics-mr1
* commit '
fea66cee1cd661b6bf8ead1988cf008fa61b01a7':
Build Support for CTS Native Tests
Brian Muramatsu [Wed, 14 Dec 2011 23:31:35 +0000 (15:31 -0800)]
Merge "Build Support for CTS Native Tests" into ics-mr1
David 'Digit' Turner [Tue, 13 Dec 2011 16:21:56 +0000 (17:21 +0100)]
x86: Refine the way we configure the x86 build.
This is the result of a recent conversation around the x86 ABI
and its relationship with how we build platform images. Briefly:
- We want to use feature-based macros like ARCH_X86_HAVE_$FEATURE
instead of relying on explicit compiler macros like -DUSE_$FEATURE
- We want to allow for other x86-based arch variants, e.g. if
someone wants to build Android for a CPU that doesn't support
the NDK x86 ABI. However, we need to ensure these are not
tagged compatible by mistake (see check at the end of TARGET_linux-x86.mk)
- There are several flags which use is dubious now that we have
a dedicated toolchain to build all the x86 stuff. Comment them
as 'to be considered for removal'. We'll do the proper checks
later.
Change-Id: I7768d7c34d73e274cbf4c09ae831b55280d6bb58
The Android Open Source Project [Wed, 14 Dec 2011 04:05:21 +0000 (20:05 -0800)]
am
4f732584: Reconcile with ics-mr1-release
* commit '
4f7325849bad0c41f451ab177bac037c20f00de0':
IML74D
The Android Open Source Project [Wed, 14 Dec 2011 04:03:11 +0000 (20:03 -0800)]
Reconcile with ics-mr1-release
Change-Id: I4518215eb5788221551703ab02142d909644c1a7
The Android Automerger [Wed, 14 Dec 2011 04:00:27 +0000 (20:00 -0800)]
IML74D
The Android Open Source Project [Wed, 14 Dec 2011 03:11:23 +0000 (19:11 -0800)]
am
5b08f649: Reconcile with ics-mr1-release
* commit '
5b08f6499a2bcd97ec88ae2719edb90d025cd298':
IML74C
IML74B
IML74
The Android Open Source Project [Wed, 14 Dec 2011 03:10:04 +0000 (19:10 -0800)]
Reconcile with ics-mr1-release
Change-Id: Ibbd535845a392e5749d367ce406e7d5251b6d83f
The Android Automerger [Wed, 14 Dec 2011 02:54:33 +0000 (18:54 -0800)]
IML74C
The Android Automerger [Wed, 14 Dec 2011 01:36:34 +0000 (17:36 -0800)]
IML74B
The Android Automerger [Wed, 14 Dec 2011 01:35:59 +0000 (17:35 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Wed, 14 Dec 2011 00:06:06 +0000 (16:06 -0800)]
IML74
The Android Automerger [Wed, 14 Dec 2011 00:02:06 +0000 (16:02 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Vladimir Chtchetkine [Tue, 13 Dec 2011 22:39:12 +0000 (14:39 -0800)]
Merge "Add boot property enabling ADBD over QEMU"
Brian Muramatsu [Tue, 13 Dec 2011 07:54:49 +0000 (23:54 -0800)]
Build Support for CTS Native Tests
Bug
4970300
Adds two new variables, CTS_TEST_CASES and CTS_TEST_XMLS, to be read
from CtsTestCaseList.mk. The CTS_TEST_CASES variable can be used to
copy any sort of file to the repository/testcases CTS directory.
The CTS_TEST_XMLS variable can be used to inject test package xmls
from any source rather than relying upon the monolithic and
mostly serial buildCts.py script.
The existing CTS_CORE_CASE_LIST is coded to only support APKs, so
it could not be retrofitted to support native tests. However, the
two new variables can do even more than CTS_CORE_CASE_LIST due to
their generality. In the future, the idea is move away from
CTS_CORE_CASE_LIST and also generate XMLs using separate tools
rather than just buildCts.py.
Change-Id: Ib52722861c37e0f4d511f9041928395bcaba5dea
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
Ying Wang [Mon, 12 Dec 2011 20:57:38 +0000 (12:57 -0800)]
Collect the GPL source files.
Bug:
5693205
Change-Id: I045b83949f8b29d7c5cf5c0ab32c5b83cf398e71
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."