OSDN Git Service
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.
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':
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
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
The Android Automerger [Thu, 8 Dec 2011 00:42:26 +0000 (16:42 -0800)]
ICL53F
The Android Automerger [Wed, 7 Dec 2011 19:15:49 +0000 (11:15 -0800)]
IML67B
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: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 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 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 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
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
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