The Android Automerger
cb3317f845
merge in ics-mr1-release history after reset to ics-mr1
2011-12-12 22:07:51 -08:00
Jean-Baptiste Queru
f641a5975d
am a2c1261e: (-s ours) Set version numbers for AOSP - do not merge
...
* commit 'a2c1261e719b4fbac9eee4e348b629360870468f':
Set version numbers for AOSP - do not merge
2011-12-12 18:01:28 -08:00
Ying Wang
e109a1d08d
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
2011-12-12 17:52:03 -08:00
Jesse Hall
fa947d04dd
am 055cf585: am 615d2ffa: Enable the OpenGL View renderer on the emulator
...
* commit '055cf585b567af6ced36d7227a2ae921df5782e0':
Enable the OpenGL View renderer on the emulator
2011-12-12 17:49:18 -08:00
Ying Wang
b5a413e6cc
Merge "Restrict vendor modules to help AOSP product distribution."
2011-12-12 17:32:22 -08:00
Jean-Baptiste Queru
a2c1261e71
Set version numbers for AOSP - do not merge
...
Change-Id: I7be67f46069ed758e67066e696aa2567983fa374
2011-12-12 17:16:07 -08:00
The Android Open Source Project
c2c7af99d4
am cd197842: Reconcile with ics-mr1-release
...
* commit 'cd197842b6b17c16b01b0f3608f7177faa5ab505':
IML70C
IML70B
2011-12-12 15:39:11 -08:00
Bruce Beare
29371f157a
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
2011-12-12 15:39:05 -08:00
The Android Open Source Project
5ec82bcfdd
am e7a33465: Reconcile with ics-mr1-release
...
* commit 'e7a33465ac64218e146d72b2af0fd3a862128be1':
IML70
IML69C
IML69B
2011-12-12 15:29:48 -08:00
Jesse Hall
055cf585b5
am 615d2ffa: Enable the OpenGL View renderer on the emulator
...
* commit '615d2ffa926d03ba44fbc58b4593ce96ef831783':
Enable the OpenGL View renderer on the emulator
2011-12-12 15:22:32 -08:00
Ying Wang
dbb31be413
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
2011-12-12 14:17:55 -08:00
Ying Wang
fd626f2d21
Collect the GPL source files.
...
Bug: 5693205
Change-Id: I045b83949f8b29d7c5cf5c0ab32c5b83cf398e71
2011-12-12 12:57:38 -08:00
Jesse Hall
615d2ffa92
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
2011-12-12 10:07:04 -08:00
The Android Open Source Project
cd197842b6
Reconcile with ics-mr1-release
...
Change-Id: I623e25d55ed00b150729425f710ca52af2de7913
2011-12-12 06:50:16 -08:00
The Android Automerger
00d48ec3e0
IML70C
2011-12-10 21:35:46 -08:00
Bruce Beare
381581613a
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
2011-12-09 16:21:00 -08:00
The Android Automerger
7578d7e58c
IML70B
2011-12-09 16:19:55 -08:00
The Android Automerger
63138065da
merge in ics-mr1-release history after reset to ics-mr1
2011-12-09 16:15:20 -08:00
The Android Open Source Project
21984f9581
am 424e8787: am 91789538: Reconcile with ics-mr0-release
...
* commit '424e8787c958829fed7f5020f23e4a02b86d0ec4':
2011-12-09 14:58:03 -08:00
The Android Open Source Project
41fade1f33
am 374011a7: (-s ours) Reconcile with ics-mr0-release ics-mr1-release
...
* commit '374011a72ef62b2381235f07fb9117fbb03f12c7':
IML69
ICL53F
IML67B
2011-12-09 14:57:25 -08:00
Kenny Root
5d0edfc426
Merge "Use ARM TLS register for emulator"
2011-12-09 14:10:22 -08:00
Bruce Beare
3343b27c53
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>
2011-12-09 13:27:08 -08:00
The Android Open Source Project
e7a33465ac
Reconcile with ics-mr1-release
...
Change-Id: I7267a0f90aad28d4698b6c7ebd0e69e9dcd6ade6
2011-12-09 07:10:41 -08:00
The Android Automerger
5df6892ebd
IML70
2011-12-09 06:59:51 -08:00
The Android Automerger
d83ef16e65
merge in ics-mr1-release history after reset to ics-mr1
2011-12-09 06:57:15 -08:00
The Android Automerger
3c1e3b648d
IML69C
2011-12-08 17:37:41 -08:00
The Android Automerger
e513ee2462
merge in ics-mr1-release history after reset to ics-mr1
2011-12-08 17:34:09 -08:00
The Android Automerger
fd9df82adf
IML69B
2011-12-08 11:30:49 -08:00
The Android Open Source Project
424e8787c9
am 91789538: Reconcile with ics-mr0-release
...
* commit '917895384fb7c9fb9ca858fdf792ec165e151de9':
2011-12-08 10:27:13 -08:00
The Android Open Source Project
917895384f
Reconcile with ics-mr0-release
...
Change-Id: I7b413162b41b52be626b4ebc5c3f3ea37fdc6288
2011-12-08 10:25:56 -08:00
The Android Open Source Project
374011a72e
Reconcile with ics-mr0-release ics-mr1-release
...
Change-Id: I7bc70364e017d1c67bcc4b308e0aff5eaa19e661
2011-12-08 10:21:25 -08:00
Kenny Root
ab4fbffdfb
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
2011-12-08 08:51:07 -08:00
The Android Automerger
91158c9b5e
IML69
2011-12-08 07:03:55 -08:00
The Android Automerger
c3c0dfb891
merge in ics-mr1-release history after reset to ics-mr1
2011-12-08 06:59:23 -08:00
Stephen Hines
d2972716be
Merge "Enable -Wall/-Werror with LOCAL_RENDERSCRIPT_FLAGS."
2011-12-07 17:26:25 -08:00
The Android Automerger
69dbcc9ad7
ICL53F
2011-12-07 16:42:26 -08:00
Stephen Hines
914f7a2990
Enable -Wall/-Werror with LOCAL_RENDERSCRIPT_FLAGS.
...
Change-Id: Ia2a058e6711839d89072c2e96f0c60aa4cedda6b
2011-12-07 11:41:28 -08:00
The Android Automerger
dcd0084bfc
IML67B
2011-12-07 11:15:49 -08:00
Dianne Hackborn
b0f29e007d
resolved conflicts for merge of d7b15982
to master
...
Change-Id: Iaa744477dd64e9833888f72186ec0676e99f28e4
2011-12-07 10:47:11 -08:00
Dianne Hackborn
d7b15982d2
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.
2011-12-07 10:34:21 -08:00
Dianne Hackborn
e73b24ccbe
Did I say 4.1? Oh well what I *really* meant was 4.0.3, of course.
...
Change-Id: I61ccc290aec8fa7e2e68cf01bc920a65b8b9e246
2011-12-07 10:30:19 -08:00
The Android Open Source Project
6bc8adeadf
Reconcile with ics-mr1-release
...
Change-Id: Ib6c72245d2135fe255c5dada01754cb5e03d761c
2011-12-07 07:44:22 -08:00
The Android Open Source Project
217d885573
am e3bdf69c: am febd861a: Reconcile with ics-mr0-release
...
* commit 'e3bdf69cc6af9a7deec5a44823e5a0a2e1f16064':
ICL53E
2011-12-07 07:27:54 -08:00
The Android Open Source Project
e3bdf69cc6
am febd861a: Reconcile with ics-mr0-release
...
* commit 'febd861a073b0500b6e7f0ea117b71df3bc6822c':
ICL53E
2011-12-07 07:26:16 -08:00
The Android Open Source Project
febd861a07
Reconcile with ics-mr0-release
...
Change-Id: Ifdc1b145e1f778260a1445c954ea2e7848e67c19
2011-12-07 07:24:51 -08:00
Jean-Baptiste Queru
c401b4438c
am 0cd997ff: am 8af0efd6: Improve handling of absolute paths in out directory
...
* commit '0cd997ff31852af80eab4f3d0c2db8d1a1328085':
Improve handling of absolute paths in out directory
2011-12-06 22:53:45 -08:00
Jean-Baptiste Queru
316febd715
am 78b68045: am ffe03c98: Set OUT_DIR based on a common base path
...
* commit '78b680458b3ba53fb2f88a603e371c002eb8944b':
Set OUT_DIR based on a common base path
2011-12-06 22:53:44 -08:00
Jean-Baptiste Queru
0cd997ff31
am 8af0efd6: Improve handling of absolute paths in out directory
...
* commit '8af0efd6a157e682d88c9a6e030f37bab9860caf':
Improve handling of absolute paths in out directory
2011-12-06 19:32:38 -08:00
Jean-Baptiste Queru
78b680458b
am ffe03c98: Set OUT_DIR based on a common base path
...
* commit 'ffe03c984b2836a9b4e4ddb5a17ec0dd26ba686c':
Set OUT_DIR based on a common base path
2011-12-06 19:32:37 -08:00
The Android Automerger
43e70ba73e
IML67
2011-12-06 16:56:46 -08:00