OSDN Git Service
Ying Wang [Fri, 24 Feb 2012 00:27:43 +0000 (16:27 -0800)]
Fix bug with the HOST_AR.
Change-Id: I28ab86d3b6e7cbd4391e2640cf8e2be269b03e76
The Android Open Source Project [Thu, 23 Feb 2012 19:20:26 +0000 (11:20 -0800)]
The Android Open Source Project [Thu, 23 Feb 2012 19:20:24 +0000 (11:20 -0800)]
am
0f4616b0: am
065506ec: Reconcile with ics-mr1-release
* commit '
0f4616b017b72deec9f0b3c20205cd447fea835d':
IMM52
The Android Open Source Project [Thu, 23 Feb 2012 19:20:00 +0000 (11:20 -0800)]
The Android Open Source Project [Thu, 23 Feb 2012 19:19:50 +0000 (11:19 -0800)]
am
c4c305e3: am
a2ca4f14: Reconcile with ics-mr1-release
* commit '
c4c305e331e4e5ae3f5616f79dfc597e2abfc166':
IMM48
Xavier Ducrohet [Thu, 23 Feb 2012 16:34:50 +0000 (08:34 -0800)]
am
182cc516: am
87e90f4e: am
fe53eeb0: Declare the emulator as a multi-touch device.
* commit '
182cc516576668ced0d419915188c0f3f16a0bfe':
Jean-Baptiste Queru [Thu, 23 Feb 2012 16:19:50 +0000 (08:19 -0800)]
Merge
ab0776e4
Change-Id: Ia73777689fcbe4849a5e29ef4e120e0d1f2ba8bf
The Android Open Source Project [Thu, 23 Feb 2012 15:29:09 +0000 (07:29 -0800)]
The Android Open Source Project [Thu, 23 Feb 2012 15:29:00 +0000 (07:29 -0800)]
am
ae2fa4a5: am
72c4afc9: Reconcile with ics-mr1-release
* commit '
ae2fa4a5bec4574c5da9f32f9f637bd733ab16d0':
IMM47B
Xavier Ducrohet [Thu, 23 Feb 2012 15:28:46 +0000 (07:28 -0800)]
am
9233c075: am
d9bd216e: am
295cb9bc: Enable HW accelerated view framework for generic_x86 builds.
* commit '
9233c075d6adea37c694a6f6135f9e58af12b721':
Xavier Ducrohet [Thu, 23 Feb 2012 15:28:46 +0000 (07:28 -0800)]
am
85927411: am
590737b6: am
295cb9bc: Enable HW accelerated view framework for generic_x86 builds.
* commit '
85927411d2e249aab081fc39c838dbc6e2ff93ea':
Enable HW accelerated view framework for generic_x86 builds.
The Android Open Source Project [Tue, 21 Feb 2012 23:38:23 +0000 (15:38 -0800)]
am
d0d7086f: Reconcile with ics-mr1-release
* commit '
d0d7086fb6012b72731fcefeabe92edccaaf89eb':
The Android Open Source Project [Tue, 21 Feb 2012 23:36:39 +0000 (15:36 -0800)]
am
065506ec: Reconcile with ics-mr1-release
* commit '
065506ec25b39b1abdcefb483992d71be70defb6':
IMM52
The Android Open Source Project [Tue, 21 Feb 2012 23:36:28 +0000 (15:36 -0800)]
Reconcile with ics-mr1-release
Change-Id: Ie9e79a16a3541f85ef9d1a7ffd4fe470c3570a16
The Android Open Source Project [Tue, 21 Feb 2012 23:34:42 +0000 (15:34 -0800)]
Reconcile with ics-mr1-release
Change-Id: Ib089acee59a2ac7913b5d35185f165f777800626
The Android Automerger [Tue, 21 Feb 2012 23:30:40 +0000 (15:30 -0800)]
IMM52
The Android Automerger [Tue, 21 Feb 2012 23:25:53 +0000 (15:25 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
The Android Open Source Project [Tue, 21 Feb 2012 23:15:26 +0000 (15:15 -0800)]
am
96859329: Reconcile with ics-mr1-release
* commit '
96859329d3f9a7a1c9834810e16747e205ea16c7':
The Android Open Source Project [Tue, 21 Feb 2012 23:13:23 +0000 (15:13 -0800)]
Reconcile with ics-mr1-release
Change-Id: I4c70661759198e26a86a1070746a9b609598a2f2
The Android Open Source Project [Tue, 21 Feb 2012 23:08:13 +0000 (15:08 -0800)]
am
a2ca4f14: Reconcile with ics-mr1-release
* commit '
a2ca4f14f43636b00aba274718854e9ed851959d':
IMM48
The Android Open Source Project [Tue, 21 Feb 2012 23:06:21 +0000 (15:06 -0800)]
Reconcile with ics-mr1-release
Change-Id: I3f6da4c538fdb160bed6228d1d57026c7e9c12eb
Doug Zongker [Tue, 21 Feb 2012 20:59:33 +0000 (12:59 -0800)]
Merge "releasetools: Fix image size checking"
Mathias Agopian [Tue, 21 Feb 2012 20:52:15 +0000 (12:52 -0800)]
Merge "frameworks/base refactoring"
Kenny Root [Tue, 21 Feb 2012 20:52:12 +0000 (12:52 -0800)]
Merge "Enable TLS register by default for ARMv7a arch"
Andrew Boie [Tue, 14 Feb 2012 17:32:52 +0000 (09:32 -0800)]
releasetools: Fix image size checking
A block of code that should be evaluated for all
image types was instead only being run for yaffs
partitions.
Change-Id: I83ccbd7fa3c1bc02b9bba0832701ecc258e40a7d
Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
Kenny Root [Tue, 21 Feb 2012 17:17:18 +0000 (09:17 -0800)]
Enable TLS register by default for ARMv7a arch
Everything that is based on ARMv7a should have a cp15 TLS register.
Enable it by default so it's not accidentally missed in newer board
configurations. In fact, this could be enabled for ARMv6 as well, but we
currently don't distinguish between ARMv5 and ARMv6 in the build system.
This can still be disabled by setting it to "false" in the board
configuration, but this shouldn't ever be needed.
Change-Id: Ic2918f32899c8bcfa482f92c98f5a192fa318470
Mathias Agopian [Tue, 21 Feb 2012 01:03:12 +0000 (17:03 -0800)]
frameworks/base refactoring
add libandroidfw.so to the build
Change-Id: If84e8afd5056a5ac66c3c9e116d821a8a5a571dd
Xavier Ducrohet [Sun, 19 Feb 2012 15:46:07 +0000 (07:46 -0800)]
am
87e90f4e: am
fe53eeb0: Declare the emulator as a multi-touch device.
* commit '
87e90f4e3b05aaa6d759f744fc8f835b9394b6e3':
Todd Poynor [Sat, 18 Feb 2012 05:54:30 +0000 (21:54 -0800)]
Merge "build: goldfish: add emulator Power HAL"
Todd Poynor [Sat, 18 Feb 2012 04:37:21 +0000 (20:37 -0800)]
Merge "build: Add default/legacy Power HAL"
Mathias Agopian [Sat, 18 Feb 2012 03:41:13 +0000 (19:41 -0800)]
frameworks/base refactoring: build fix
Change-Id: If9f1b8a6a9eafa9ea17a3b994941c5c369be2130
Xavier Ducrohet [Sat, 18 Feb 2012 01:10:32 +0000 (17:10 -0800)]
am
c06eaa4c: am
fe53eeb0: Declare the emulator as a multi-touch device.
* commit '
c06eaa4cadd32825a8b3a1bda7bba83ceccb7e00':
Declare the emulator as a multi-touch device.
Xavier Ducrohet [Sat, 18 Feb 2012 01:08:29 +0000 (17:08 -0800)]
am
fe53eeb0: Declare the emulator as a multi-touch device.
* commit '
fe53eeb07617540dc4a920561f4bd2d4f8ae0aa9':
Declare the emulator as a multi-touch device.
Xavier Ducrohet [Sat, 18 Feb 2012 01:08:29 +0000 (17:08 -0800)]
am
fe53eeb0: Declare the emulator as a multi-touch device.
* commit '
fe53eeb07617540dc4a920561f4bd2d4f8ae0aa9':
Declare the emulator as a multi-touch device.
Xavier Ducrohet [Sat, 18 Feb 2012 01:05:52 +0000 (17:05 -0800)]
Declare the emulator as a multi-touch device.
Also add the default handheld features.
Change-Id: I768094e5e9ef474ee4f6cce5c87c37b3681926ee
The Android Automerger [Sat, 18 Feb 2012 00:42:18 +0000 (16:42 -0800)]
IMM48
The Android Automerger [Sat, 18 Feb 2012 00:36:53 +0000 (16:36 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Todd Poynor [Sat, 18 Feb 2012 00:06:31 +0000 (16:06 -0800)]
build: goldfish: add emulator Power HAL
Change-Id: Id6de532d56dabcb8709bb3e331780c8b7f508973
Signed-off-by: Todd Poynor <toddpoynor@google.com>
John Grossman [Fri, 17 Feb 2012 19:49:31 +0000 (11:49 -0800)]
Merge "Attempt to fix the emulator."
Scott Anderson [Fri, 17 Feb 2012 19:24:01 +0000 (11:24 -0800)]
Merge "Remove simg2img from user_tags.mk"
John Grossman [Fri, 17 Feb 2012 16:55:18 +0000 (08:55 -0800)]
Attempt to fix the emulator.
I failed to add the default HAL for the new local_time HAL to the
emulator build. Emulator experts have advised me that this is the
correct place to do so; hopefully it will fix the emulator's startup.
See bug
6029440
Change-Id: Ib0ab8a226628105c72ffcf7ae511d390630ea045
The Android Open Source Project [Fri, 17 Feb 2012 17:04:04 +0000 (09:04 -0800)]
am
0e511149: Reconcile with ics-mr1-release
* commit '
0e51114927aecac7a283eee4d6449709027224d5':
The Android Open Source Project [Fri, 17 Feb 2012 17:02:41 +0000 (09:02 -0800)]
Reconcile with ics-mr1-release
Change-Id: Ia3e6e7211e43f82053ebbdd87f4bfacf13d2495a
The Android Open Source Project [Fri, 17 Feb 2012 16:11:33 +0000 (08:11 -0800)]
am
72c4afc9: Reconcile with ics-mr1-release
* commit '
72c4afc998d6362d94acfa943349091993edad11':
IMM47B
The Android Open Source Project [Fri, 17 Feb 2012 16:09:26 +0000 (08:09 -0800)]
Reconcile with ics-mr1-release
Change-Id: I4b9445667934514a9c04ed8df17f422d7c3755aa
Xavier Ducrohet [Fri, 17 Feb 2012 02:26:45 +0000 (18:26 -0800)]
Merge "Make sure the emulator system image define the features it supports."
Xavier Ducrohet [Fri, 17 Feb 2012 00:40:53 +0000 (16:40 -0800)]
am
d9bd216e: am
295cb9bc: Enable HW accelerated view framework for generic_x86 builds.
* commit '
d9bd216ea7d3030b84c61d551b87781269e418a7':
Xavier Ducrohet [Fri, 17 Feb 2012 00:39:53 +0000 (16:39 -0800)]
am
590737b6: am
295cb9bc: Enable HW accelerated view framework for generic_x86 builds.
* commit '
590737b674a1e9254863e36f45956a9c309db68f':
Enable HW accelerated view framework for generic_x86 builds.
Xavier Ducrohet [Fri, 17 Feb 2012 00:38:39 +0000 (16:38 -0800)]
am
295cb9bc: Enable HW accelerated view framework for generic_x86 builds.
* commit '
295cb9bceef599f851db81a3942dc78bdb679fec':
Enable HW accelerated view framework for generic_x86 builds.
Xavier Ducrohet [Fri, 17 Feb 2012 00:37:51 +0000 (16:37 -0800)]
am
295cb9bc: Enable HW accelerated view framework for generic_x86 builds.
* commit '
295cb9bceef599f851db81a3942dc78bdb679fec':
Enable HW accelerated view framework for generic_x86 builds.
Xavier Ducrohet [Fri, 17 Feb 2012 00:35:42 +0000 (16:35 -0800)]
Enable HW accelerated view framework for generic_x86 builds.
Change-Id: Ib3bf3e7c08615c29c0086125552ae1a96a737b89
The Android Automerger [Fri, 17 Feb 2012 00:29:10 +0000 (16:29 -0800)]
IMM47B
The Android Automerger [Fri, 17 Feb 2012 00:24:21 +0000 (16:24 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Todd Poynor [Sat, 11 Feb 2012 02:33:58 +0000 (18:33 -0800)]
build: Add default/legacy Power HAL
Change-Id: Ifa1e87c2f45dab3bb7aa07db12c8cfb5a8a38063
Signed-off-by: Todd Poynor <toddpoynor@google.com>
John Grossman [Fri, 10 Feb 2012 22:36:13 +0000 (14:36 -0800)]
Add the default local_time HAL to the base product.
Change-Id: I951718d2de13a2e92d41effac75bb75ea4c9fafe
Svetoslav Ganov [Thu, 16 Feb 2012 21:07:50 +0000 (13:07 -0800)]
Merge "Adding shell commands for manipulating content via content providers."
The Android Open Source Project [Thu, 16 Feb 2012 19:25:29 +0000 (11:25 -0800)]
The Android Open Source Project [Thu, 16 Feb 2012 19:25:12 +0000 (11:25 -0800)]
am
90b66d88: am
6532f0e5: Reconcile with ics-mr1-release
* commit '
90b66d881a065b5df86af5b415cc2399e29905a4':
IMM47
IMM46
IMM45
IMM30E
The Android Open Source Project [Thu, 16 Feb 2012 18:11:48 +0000 (10:11 -0800)]
am
4b067bdf: Reconcile with ics-mr1-release
* commit '
4b067bdf05bd8fca840253a43fb0ff25846d35c1':
The Android Open Source Project [Thu, 16 Feb 2012 18:09:59 +0000 (10:09 -0800)]
Reconcile with ics-mr1-release
Change-Id: I148d68967a5aef6aef6c785222a35ff242406525
The Android Open Source Project [Thu, 16 Feb 2012 18:04:14 +0000 (10:04 -0800)]
am
6532f0e5: Reconcile with ics-mr1-release
* commit '
6532f0e55b4340fe91a1097d3ddd72282b4de50d':
IMM47
IMM46
IMM45
IMM30E
The Android Open Source Project [Thu, 16 Feb 2012 18:02:06 +0000 (10:02 -0800)]
Reconcile with ics-mr1-release
Change-Id: I3cf7e38adf5847f0b3327c738cf38c0df9abcdea
The Android Automerger [Thu, 16 Feb 2012 17:43:11 +0000 (09:43 -0800)]
IMM47
The Android Automerger [Thu, 16 Feb 2012 17:39:02 +0000 (09:39 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Scott Anderson [Thu, 16 Feb 2012 01:29:15 +0000 (17:29 -0800)]
Remove simg2img from user_tags.mk
Change-Id: Ibc0d6cacd25b343424cecce63fb1cd9c6d714f92
Signed-off-by: Scott Anderson <saa@android.com>
Jean-Baptiste Queru [Wed, 15 Feb 2012 22:26:37 +0000 (14:26 -0800)]
am
f0042eb7: (-s ours) am
60564322: Move AOSP to another fake version number
* commit '
f0042eb787953992a6fd9e5dd440cc3bd5ec73ba':
Move AOSP to another fake version number
Jean-Baptiste Queru [Wed, 15 Feb 2012 22:09:07 +0000 (14:09 -0800)]
am
60564322: Move AOSP to another fake version number
* commit '
605643224e096c43602c2e0e229410fa387e3331':
Move AOSP to another fake version number
Jean-Baptiste Queru [Wed, 15 Feb 2012 22:04:45 +0000 (14:04 -0800)]
Move AOSP to another fake version number
Change-Id: Ida0282d1eccaa2bdaf4ca54aaf82680efdbaa271
The Android Automerger [Wed, 15 Feb 2012 20:35:15 +0000 (12:35 -0800)]
IMM46
The Android Automerger [Wed, 15 Feb 2012 20:30:49 +0000 (12:30 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Ying Wang [Wed, 15 Feb 2012 19:38:29 +0000 (11:38 -0800)]
Merge "Remove generic_armv5 board config and product."
Ying Wang [Wed, 15 Feb 2012 00:50:52 +0000 (16:50 -0800)]
Remove generic_armv5 board config and product.
Bug:
6015755
We don't need to support ARMv5 in cts for master going forward.
cts is the only component that needs generic_armv5 config.
Change-Id: Iad35f78737dc30faeed247fda0e77d74cb8f815b
Jean-Baptiste Queru [Wed, 15 Feb 2012 00:27:38 +0000 (16:27 -0800)]
am
693e7d5e: am
aa9c5b9f: am
e7754220: Merge "Merge "Move Windows SDK whitelist out of main.mk""
* commit '
693e7d5e09cc4e413165616f50e6d2c0ee2459da':
Merge "Move Windows SDK whitelist out of main.mk"
Jean-Baptiste Queru [Wed, 15 Feb 2012 00:25:15 +0000 (16:25 -0800)]
am
aa9c5b9f: am
e7754220: Merge "Merge "Move Windows SDK whitelist out of main.mk""
* commit '
aa9c5b9f89047642010fe165f7815e1fb67b867c':
Merge "Move Windows SDK whitelist out of main.mk"
Xavier Ducrohet [Tue, 14 Feb 2012 23:35:43 +0000 (15:35 -0800)]
Make sure the emulator system image define the features it supports.
Some of them are actually not supported (BT) but it's important
they are there anyway so that we don't prevent app installation.
Change-Id: If1dbde1faec532f0e8a47e5b7972a41b708e0a85
Jean-Baptiste Queru [Tue, 14 Feb 2012 22:51:24 +0000 (14:51 -0800)]
am
e7754220: Merge "Merge "Move Windows SDK whitelist out of main.mk""
* commit '
e77542205f36f063c68407a7de0af2ce80e856d3':
Merge "Move Windows SDK whitelist out of main.mk"
The Android Automerger [Tue, 14 Feb 2012 22:20:59 +0000 (14:20 -0800)]
IMM45
The Android Automerger [Tue, 14 Feb 2012 22:13:48 +0000 (14:13 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Jean-Baptiste Queru [Tue, 14 Feb 2012 21:08:13 +0000 (13:08 -0800)]
Merge "Merge "Move Windows SDK whitelist out of main.mk""
Raphael Moll [Thu, 26 Jan 2012 23:11:46 +0000 (15:11 -0800)]
Merge "Move Windows SDK whitelist out of main.mk"
This replaces the list maintained in build/core/main.mk
by 2 makefiles in sdk.git and development.git.
Pre-requisite CLs: Change Ifa8111dbae for sdk.git
and Change Ie6f728bee for development.git
(cherry-pick of
347f3051814d7d36a9a6af387e724bb327b53ecd)
Change-Id: I6d1f4c974a6425e50e3e287c66a4e8090cf814cb
Elliott Hughes [Tue, 14 Feb 2012 16:31:20 +0000 (08:31 -0800)]
Merge "Linker script support for constructor priorities."
The Android Automerger [Tue, 14 Feb 2012 00:36:49 +0000 (16:36 -0800)]
IMM30E
Jean-Baptiste Queru [Mon, 13 Feb 2012 22:42:43 +0000 (14:42 -0800)]
am
e50d91f9: am
d93d4601: am
45873583: Merge "Add extra environment info to build output"
* commit '
e50d91f9dac20546152b575cdab7781b646ee2ed':
Add extra environment info to build output
Jean-Baptiste Queru [Mon, 13 Feb 2012 22:39:55 +0000 (14:39 -0800)]
am
d93d4601: am
45873583: Merge "Add extra environment info to build output"
* commit '
d93d46016d29925e13552b97a71f89956a1dddf4':
Add extra environment info to build output
Jean-Baptiste Queru [Mon, 13 Feb 2012 22:27:27 +0000 (14:27 -0800)]
am
45873583: Merge "Add extra environment info to build output"
* commit '
458735839a82d2d381edbe71ed924d309bf07c55':
Add extra environment info to build output
Jean-Baptiste Queru [Mon, 13 Feb 2012 22:23:30 +0000 (14:23 -0800)]
Merge "Add extra environment info to build output"
Evgeniy Stepanov [Thu, 9 Feb 2012 15:25:34 +0000 (19:25 +0400)]
Linker script support for constructor priorities.
Change-Id: Ib551019b291a152921431fa2b0b6031474ed6fed
Svetoslav Ganov [Tue, 7 Feb 2012 19:21:56 +0000 (11:21 -0800)]
Adding shell commands for manipulating content via content providers.
1. This change adds the shell command to the bin folder on the device.
This will enable using shell commands (assuming right permissions
are held) on a user build to manipulate state of content providers.
For example, this will be used for running CTS tests that rely on
secure settings without adding intermediary APKs and/or manual setup.
Main change:https://android-git.corp.google.com/g/162774
Change-Id: I562eb86a4bb971dbaa42848e95e7650bf2cbb0c9
Conley Owens [Tue, 7 Feb 2012 19:16:42 +0000 (11:16 -0800)]
Add extra environment info to build output
This should help us support users with build issues.
Given that they inculde the dumpvars in their error report,
we will be able to avoid asking standard questions like
"what version of Ubuntu are you using?"
Change-Id: Ib7c452d805d5e64075a44dc40e41d4605cc1ef4a
Colin Cross [Tue, 7 Feb 2012 18:50:55 +0000 (10:50 -0800)]
Merge "Add gcc_demangle to BUILD_TINY_ANDROID projects"
The Android Open Source Project [Tue, 7 Feb 2012 18:21:22 +0000 (10:21 -0800)]
The Android Open Source Project [Tue, 7 Feb 2012 18:19:45 +0000 (10:19 -0800)]
am
c9024703: Reconcile with ics-mr1-release
* commit '
c902470310404e42aeb93fca38694b374371e0de':
The Android Open Source Project [Tue, 7 Feb 2012 18:18:29 +0000 (10:18 -0800)]
Reconcile with ics-mr1-release
Change-Id: Ib912870641c7efedd4c01066f0e86dd3f85aaa2d
The Android Open Source Project [Tue, 7 Feb 2012 18:12:57 +0000 (10:12 -0800)]
am
97e43949: am
62a16e23: Reconcile with ics-mr1-release
* commit '
97e4394902cd19219dfef7b5e20d7570b1f6ebd8':
IMM30D
IMM30C
IMM3C
The Android Open Source Project [Tue, 7 Feb 2012 18:11:09 +0000 (10:11 -0800)]
am
62a16e23: Reconcile with ics-mr1-release
* commit '
62a16e230529ec015518a3abac872ab008892e2d':
IMM30D
IMM30C
IMM3C
The Android Open Source Project [Tue, 7 Feb 2012 18:09:02 +0000 (10:09 -0800)]
Reconcile with ics-mr1-release
Change-Id: I8399f0a69c4192e7ef65e3097e7a6820e400e436
The Android Automerger [Tue, 7 Feb 2012 04:29:06 +0000 (20:29 -0800)]
IMM30D
Colin Cross [Tue, 7 Feb 2012 02:47:00 +0000 (18:47 -0800)]
Add gcc_demangle to BUILD_TINY_ANDROID projects
libgccdemangle.so is required to build libcorkscrew, which is in
system/core and built when BUILD_TINY_ANDROID is set.
Change-Id: Ide9af58cfc075e27a7368993b29be2c0e53275a8
Ed Heyl [Mon, 6 Feb 2012 21:14:03 +0000 (13:14 -0800)]
am
5d2fadb1: (-s ours) am
529a793c: am
daeb1d90: am
c547a4d5: Please do not merge (already submitted downstream); check entire recovery partition on startup
* commit '
5d2fadb1492c1a2dd5437fcfb4afde2b2c3df4bd':
Ed Heyl [Mon, 6 Feb 2012 21:12:19 +0000 (13:12 -0800)]
am
85c866a1: (-s ours) am
ca2cd25b: (-s ours) am
daeb1d90: am
c547a4d5: Please do not merge (already submitted downstream); check entire recovery partition on startup
* commit '
85c866a141c5f4fd69972aa7158e22e49944254e':
Please do not merge (already submitted downstream); check entire recovery partition on startup