Conley Owens
f3c068db26
am d38c870d: Get build system to work with Make 3.82
...
* commit 'd38c870d2e168b051692b20ade0fc966c9e2daf7':
Get build system to work with Make 3.82
2011-12-22 16:52:42 -08:00
Conley Owens
d38c870d2e
Get build system to work with Make 3.82
...
Note: `sort` can't seem to handle newlines in 3.82.
Change-Id: Ieeaee1d19688688a02e396bbc5b4dea26e7f6943
2011-12-22 15:16:05 -08:00
Al Sutton
657aeac842
am 9ce06f11: Don\'t run ranlib on MacOS 10.7
...
* commit '9ce06f11d69f5154843c234fe0624f9e70d39359':
Don't run ranlib on MacOS 10.7
2011-12-21 16:45:21 -08:00
Atte Peltomaki
05e98055fd
am 60fe963c: build: explicitly define dependency files
...
* commit '60fe963c63c1b98255ad1cf40573b81b5d90d9c3':
build: explicitly define dependency files
2011-12-21 16:45:20 -08:00
Al Sutton
9ce06f11d6
Don't run ranlib on MacOS 10.7
...
Change-Id: I74f4623e6044dd804669aaa70c6e410fa8988d75
2011-12-21 13:12:33 -08:00
Atte Peltomaki
60fe963c63
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
2011-12-21 09:24:09 -08:00
The Android Open Source Project
a4b72c9fe4
Reconcile with ics-mr1-release
...
Change-Id: Idb5f4da7a973995eafb7233d864c0cf379e35db7
2011-12-21 07:19:13 -08:00
The Android Automerger
457b7f38a5
IML81
2011-12-20 17:29:41 -08:00
The Android Automerger
ce37741314
merge in ics-mr1-release history after reset to ics-mr1
2011-12-20 17:26:02 -08:00
The Android Open Source Project
b08c5647a4
Reconcile with ics-mr1-release
...
Change-Id: I3624715f06ac682520676b2e6d45a29e1d20b1d9
2011-12-20 13:08:24 -08:00
Bruce Beare
b056d71f79
If setupwizard is disabled, don't force it to optional
...
Change-Id: I15912ed77b88ea94feb149fdd081a309e3cf4678
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
2011-12-19 09:51:40 -08:00
The Android Automerger
e521822eb2
IML77B
2011-12-17 17:30:21 -08:00
The Android Automerger
cc8efd02cc
IML77
2011-12-16 12:02:53 -08:00
The Android Automerger
16e1f203dd
merge in ics-mr1-release history after reset to ics-mr1
2011-12-16 12:01:24 -08:00
The Android Open Source Project
6c2c5d8eec
Reconcile with ics-mr1-release
...
Change-Id: I4efd2763f8ae4da60277edc110ff8649869a35e7
2011-12-16 08:07:59 -08:00
The Android Automerger
a9819e2ff1
IML74K
2011-12-16 00:15:10 -08:00
The Android Automerger
e9db408701
IML74J
2011-12-15 21:43:32 -08:00
The Android Automerger
b7ae1edc6b
IML74I
2011-12-15 20:50:23 -08:00
The Android Automerger
d1e01804de
merge in ics-mr1-release history after reset to ics-mr1
2011-12-15 20:49:52 -08:00
The Android Automerger
61a6402f08
IML74H
2011-12-15 20:18:19 -08:00
Scott Main
96f696d901
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
2011-12-15 20:10:46 -08:00
Scott Main
c4e8801c2d
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
2011-12-15 20:09:04 -08:00
Scott Main
50d6f97c46
docs: revise space wrapping to avoid "new" tags from breaking new lines alone
...
Temp fix
Change-Id: If99ce3442ec179a46fe3bbe0a06f690527d05eb5
2011-12-15 20:06:32 -08:00
Scott Main
a9255cfa7c
am 0af80fb4: am 0f429ebe: docs: fix bug in script for tab cookies
...
* commit '0af80fb409708d86b360e842bc834b3cbe4bc443':
docs: fix bug in script for tab cookies
2011-12-15 19:16:13 -08:00
Scott Main
0af80fb409
am 0f429ebe: docs: fix bug in script for tab cookies
...
* commit '0f429ebe63acbf8ccc1efe3c4185151eb15a4783':
docs: fix bug in script for tab cookies
2011-12-15 19:14:31 -08:00
Scott Main
0f429ebe63
docs: fix bug in script for tab cookies
...
Change-Id: I09a49764f66673b3f55032158efd44c228832e8f
2011-12-15 19:12:17 -08:00
Scott Main
b90afc2cf0
am 9839afdd: am 1d42360a: docs: style and script changes for android u classes
...
* commit '9839afddfcade4db1989718216b592aed76e73e7':
docs: style and script changes for android u classes
2011-12-15 17:39:41 -08:00
Scott Main
9839afddfc
am 1d42360a: docs: style and script changes for android u classes
...
* commit '1d42360a028b2d55f6d4d29bd99e8ef3de6e8402':
docs: style and script changes for android u classes
2011-12-15 17:37:35 -08:00
Scott Main
1d42360a02
docs: style and script changes for android u classes
...
Change-Id: I5866541bb9dd41329aa02328b805959c8f675f8c
2011-12-15 17:34:40 -08:00
The Android Automerger
f4d94af870
IML75
2011-12-14 22:16:29 -08:00
The Android Automerger
8aa133d092
merge in ics-mr1-release history after reset to ics-mr1
2011-12-14 22:13:33 -08:00
The Android Open Source Project
c7185534d3
Reconcile with ics-mr1-release
...
Change-Id: I13575fbc40df854f574e7eaf8cfee6153ab3a342
2011-12-14 19:57:24 -08:00
The Android Automerger
769631608c
IML74G
2011-12-14 19:28:43 -08:00
The Android Open Source Project
efe3034c71
Reconcile with ics-mr1-release
...
Change-Id: I93d6301506cdc1b3f549b7cf4dbc8a8b3adeca2b
2011-12-14 16:05:28 -08:00
The Android Automerger
9b9360c421
IML74F
2011-12-14 15:56:03 -08:00
The Android Automerger
0fb6a79220
IML74E
2011-12-14 15:44:48 -08:00
Brian Muramatsu
80fa947b03
am fea66cee: Merge "Build Support for CTS Native Tests" into ics-mr1
...
* commit 'fea66cee1cd661b6bf8ead1988cf008fa61b01a7':
Build Support for CTS Native Tests
2011-12-14 15:33:22 -08:00
Brian Muramatsu
fea66cee1c
Merge "Build Support for CTS Native Tests" into ics-mr1
2011-12-14 15:31:35 -08:00
The Android Open Source Project
4f7325849b
Reconcile with ics-mr1-release
...
Change-Id: I4518215eb5788221551703ab02142d909644c1a7
2011-12-13 20:03:11 -08:00
The Android Automerger
2fc113de8a
IML74D
2011-12-13 20:00:27 -08:00
The Android Open Source Project
5b08f6499a
Reconcile with ics-mr1-release
...
Change-Id: Ibbd535845a392e5749d367ce406e7d5251b6d83f
2011-12-13 19:10:04 -08:00
The Android Automerger
531a546eba
IML74C
2011-12-13 18:54:33 -08:00
The Android Automerger
77b9cad198
IML74B
2011-12-13 17:36:34 -08:00
The Android Automerger
10ed9524e6
merge in ics-mr1-release history after reset to ics-mr1
2011-12-13 17:35:59 -08:00
The Android Automerger
308b5299a6
IML74
2011-12-13 16:06:06 -08:00
The Android Automerger
b1244157c3
merge in ics-mr1-release history after reset to ics-mr1
2011-12-13 16:02:06 -08:00
Brian Muramatsu
237fa07339
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
2011-12-13 14:14:36 -08:00
The Android Open Source Project
d2884199bd
Reconcile with ics-mr1-release
...
Change-Id: I4e8279a5f59137d2ec2add324d117701ade68a8c
2011-12-13 05:11:37 -08:00
The Android Automerger
8590bd19eb
IML73
2011-12-12 22:11:29 -08:00
The Android Automerger
cb3317f845
merge in ics-mr1-release history after reset to ics-mr1
2011-12-12 22:07:51 -08:00
