OSDN Git Service
The Android Open Source Project [Thu, 19 Jan 2012 21:06:25 +0000 (13:06 -0800)]
Reconcile with ics-mr1-release
Change-Id: I06332ff4f1ca17df8303819c8ea85cf5f63712ca
The Android Automerger [Thu, 19 Jan 2012 05:20:54 +0000 (21:20 -0800)]
IMM18
The Android Automerger [Thu, 19 Jan 2012 05:16:29 +0000 (21:16 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Sat, 14 Jan 2012 00:21:18 +0000 (16:21 -0800)]
IMM13
The Android Automerger [Sat, 14 Jan 2012 00:16:51 +0000 (16:16 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Jean-Baptiste Queru [Fri, 13 Jan 2012 01:20:28 +0000 (17:20 -0800)]
am
fdbb9f94: am
96a228bd: Merge "Remove mention of layoutopt/uix as they are gone."
* commit '
fdbb9f94bc4b22f60fb46d0babb52c2a0d047aef':
Remove mention of layoutopt/uix as they are gone.
Jean-Baptiste Queru [Fri, 13 Jan 2012 01:18:48 +0000 (17:18 -0800)]
am
96a228bd: Merge "Remove mention of layoutopt/uix as they are gone."
* commit '
96a228bd7904b83274575522a267d178b3da2341':
Remove mention of layoutopt/uix as they are gone.
Jean-Baptiste Queru [Thu, 12 Jan 2012 22:07:20 +0000 (14:07 -0800)]
Merge "Remove mention of layoutopt/uix as they are gone."
The Android Automerger [Thu, 12 Jan 2012 22:04:09 +0000 (14:04 -0800)]
IMM12
The Android Automerger [Thu, 12 Jan 2012 22:00:23 +0000 (14:00 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
The Android Open Source Project [Thu, 12 Jan 2012 16:56:04 +0000 (08:56 -0800)]
Reconcile with ics-mr1-release
Change-Id: I8aa81509837cca423f8ac241d97e45d822086acf
Xavier Ducrohet [Thu, 12 Jan 2012 02:07:31 +0000 (18:07 -0800)]
Remove mention of layoutopt/uix as they are gone.
The Android Automerger [Thu, 12 Jan 2012 00:31:51 +0000 (16:31 -0800)]
IMM11
The Android Automerger [Thu, 12 Jan 2012 00:27:43 +0000 (16:27 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Scott Main [Wed, 11 Jan 2012 01:16:53 +0000 (17:16 -0800)]
am
f962eb10: Merge "docs: add css for Android Design links and add link to site header" into ics-mr1
* commit '
f962eb101b21814556f4edeb7128508d47cf5564':
docs: add css for Android Design links and add link to site header
Scott Main [Wed, 11 Jan 2012 01:14:34 +0000 (17:14 -0800)]
Merge "docs: add css for Android Design links and add link to site header" into ics-mr1
Vladimir Chtchetkine [Wed, 11 Jan 2012 00:42:47 +0000 (16:42 -0800)]
am
2cbcd24b: Cherry-picked from
e6b969f3b in Do not merge.
* commit '
2cbcd24ba708be5e387b8bf54351f5c2df7abbec':
Cherry-picked from
e6b969f3b in master. Do not merge.
Vladimir Chtchetkine [Tue, 13 Dec 2011 19:31:54 +0000 (11:31 -0800)]
Cherry-picked from
e6b969f3b in Do not merge.
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
Scott Main [Tue, 10 Jan 2012 17:59:22 +0000 (09:59 -0800)]
docs: add css for Android Design links and add link to site header
Change-Id: I0a9469519076b1c5b9d7c121df1f2c731a08d2cb
The Android Open Source Project [Sat, 7 Jan 2012 02:14:56 +0000 (18:14 -0800)]
Reconcile with ics-mr1-release
Change-Id: I6903bc47ab690fd56612f4e0e6289bf7a9799dca
Jean-Baptiste Queru [Sat, 7 Jan 2012 01:37:02 +0000 (17:37 -0800)]
am
5ea72eff: Use the new location of the emulator kernel
* commit '
5ea72effbd944891708d2d6fb61055830e617701':
Use the new location of the emulator kernel
Jean-Baptiste Queru [Sat, 7 Jan 2012 00:44:06 +0000 (16:44 -0800)]
Use the new location of the emulator kernel
The Android Automerger [Sat, 7 Jan 2012 00:34:51 +0000 (16:34 -0800)]
IMM06
The Android Automerger [Sat, 7 Jan 2012 00:31:06 +0000 (16:31 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Jean-Baptiste Queru [Fri, 6 Jan 2012 23:18:21 +0000 (15:18 -0800)]
am
a230c4d0: Reference kernel notice in the new location
* commit '
a230c4d049258915f6614e7a3fadc2dcfec3e160':
Reference kernel notice in the new location
Jean-Baptiste Queru [Fri, 6 Jan 2012 23:05:53 +0000 (15:05 -0800)]
Reference kernel notice in the new location
The Android Open Source Project [Thu, 5 Jan 2012 15:45:15 +0000 (07:45 -0800)]
Reconcile with ics-mr1-release
Change-Id: Iaa3637a3db5b9f2c8c4721a8ea2cb230336753f5
Al Sutton [Thu, 5 Jan 2012 04:41:53 +0000 (20:41 -0800)]
am
d8765f0f: am
80cfc37d: Partial fix for emulator under Lion.
* commit '
d8765f0f843e78c691c77264619125954d710b1a':
Partial fix for emulator under Lion.
Al Sutton [Thu, 5 Jan 2012 04:40:35 +0000 (20:40 -0800)]
am
80cfc37d: Partial fix for emulator under Lion.
* commit '
80cfc37d0f0ddbb7db09b7662b84e816ab409537':
Partial fix for emulator under Lion.
The Android Automerger [Thu, 5 Jan 2012 00:45:21 +0000 (16:45 -0800)]
IMM04
Ed Heyl [Thu, 5 Jan 2012 00:42:14 +0000 (16:42 -0800)]
Merge commit '
9a46327e' into ics-mr1-plus-aosp
The Android Automerger [Thu, 5 Jan 2012 00:41:01 +0000 (16:41 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Ed Heyl [Thu, 5 Jan 2012 00:34:18 +0000 (16:34 -0800)]
increment version to 4.0.4
Change-Id: I156516aedb714f589bd0ae2d39bc9e273b775276
Al Sutton [Wed, 4 Jan 2012 23:16:50 +0000 (15:16 -0800)]
Partial fix for emulator under Lion.
Don't use -Wl,-dynamic on Lion
Conley Owens [Fri, 23 Dec 2011 00:52:42 +0000 (16:52 -0800)]
am
d38c870d: Get build system to work with Make 3.82
* commit '
d38c870d2e168b051692b20ade0fc966c9e2daf7':
Get build system to work with Make 3.82
Conley Owens [Thu, 22 Dec 2011 17:46:19 +0000 (09:46 -0800)]
Get build system to work with Make 3.82
Note: `sort` can't seem to handle newlines in 3.82.
Change-Id: Ieeaee1d19688688a02e396bbc5b4dea26e7f6943
Al Sutton [Thu, 22 Dec 2011 00:45:21 +0000 (16:45 -0800)]
am
9ce06f11: Don\'t run ranlib on MacOS 10.7
* commit '
9ce06f11d69f5154843c234fe0624f9e70d39359':
Don't run ranlib on MacOS 10.7
Atte Peltomaki [Thu, 22 Dec 2011 00:45:20 +0000 (16:45 -0800)]
am
60fe963c: build: explicitly define dependency files
* commit '
60fe963c63c1b98255ad1cf40573b81b5d90d9c3':
build: explicitly define dependency files
Al Sutton [Wed, 21 Dec 2011 21:12:05 +0000 (13:12 -0800)]
Don't run ranlib on MacOS 10.7
Change-Id: I74f4623e6044dd804669aaa70c6e410fa8988d75
Atte Peltomaki [Wed, 21 Dec 2011 17:24:09 +0000 (09:24 -0800)]
build: explicitly define dependency files
Groundwork for distcc support in Android build system,
see distcc FAQ for details on why -MF is needed:
http://distcc.googlecode.com/svn/trunk/doc/web/faq.html
The Android Open Source Project [Wed, 21 Dec 2011 15:19:13 +0000 (07:19 -0800)]
Reconcile with ics-mr1-release
Change-Id: Idb5f4da7a973995eafb7233d864c0cf379e35db7
The Android Automerger [Wed, 21 Dec 2011 01:29:41 +0000 (17:29 -0800)]
IML81
The Android Automerger [Wed, 21 Dec 2011 01:26:02 +0000 (17:26 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
The Android Open Source Project [Tue, 20 Dec 2011 21:08:24 +0000 (13:08 -0800)]
Reconcile with ics-mr1-release
Change-Id: I3624715f06ac682520676b2e6d45a29e1d20b1d9
Bruce Beare [Thu, 1 Dec 2011 20:46:12 +0000 (12:46 -0800)]
If setupwizard is disabled, don't force it to optional
Change-Id: I15912ed77b88ea94feb149fdd081a309e3cf4678
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
The Android Automerger [Sun, 18 Dec 2011 01:30:21 +0000 (17:30 -0800)]
IML77B
The Android Automerger [Fri, 16 Dec 2011 20:02:53 +0000 (12:02 -0800)]
IML77
The Android Automerger [Fri, 16 Dec 2011 20:01:24 +0000 (12:01 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
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: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: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: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
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: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:05:28 +0000 (16:05 -0800)]
Reconcile with ics-mr1-release
Change-Id: I93d6301506cdc1b3f549b7cf4dbc8a8b3adeca2b
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: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
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: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
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
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 01:16:07 +0000 (17:16 -0800)]
Set version numbers for AOSP - do not merge
Change-Id: I7be67f46069ed758e67066e696aa2567983fa374
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
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
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':