Brett Chabot
358b24700b
Add cts-tradefed to cts build.
...
Bug 3403768
Change-Id: I0ca2068f93f25b2f5f6691c5ce70573da4a12aa6
2011-01-31 12:57:56 -08:00
Jean-Baptiste Queru
de50cfb5f9
Merge "partial build fix"
2011-01-31 12:36:05 -08:00
Jean-Baptiste Queru
bf041eb259
partial build fix
...
Change-Id: I34fe778ac366d702b9eb626feaedda05e69e8361
2011-01-31 12:35:02 -08:00
The Android Open Source Project
56486e1144
am 64f13e67: Reconcile gingerbread-plus-aosp and honeycomb
...
* commit '64f13e6767cd76766a5e5edd192cfcd6e71e036e':
2011-01-30 12:53:31 -08:00
The Android Open Source Project
64f13e6767
Reconcile gingerbread-plus-aosp and honeycomb
...
Change-Id: I3cbceaedf5db731a1eb8340a7644dfe97b98097b
2011-01-30 12:39:46 -08:00
The Android Open Source Project
3b6bf4484e
Mass merge from gingerbread - do not merge
...
Change-Id: Idbfeda9c0a9720d894352747c01754ed2c90c44d
2011-01-30 12:39:46 -08:00
Scott Main
9a3107e18b
am 05d14cb9: (-s ours) Merge "don\'t use the sdkdoc template if the index file is a preview (the features.html doc is no longer used, so removed check for that also)" into gingerbread
...
* commit '05d14cb9f03044e11f7c056dae1e576bb5cd3716':
don't use the sdkdoc template if the index file is a preview (the features.html doc is no longer used, so removed check for that also)
2011-01-29 10:29:38 -08:00
Dianne Hackborn
8d378137af
am 50738779: (-s ours) DO NOT MERGE Fix issue #3373438 : Update GBMR versions
...
* commit '50738779d90970a3e36fe40a78df724946f323db':
DO NOT MERGE Fix issue #3373438 : Update GBMR versions
2011-01-29 09:27:44 -08:00
Eric Fischer
2cbc3bb1fb
am 54a6b731: Merge "Flesh out the languages_full list with recently added locales." into gingerbread
...
* commit '54a6b731da4029237410f04c1b6cb9b64bf2783f':
Flesh out the languages_full list with recently added locales.
2011-01-29 09:27:42 -08:00
Jean-Baptiste Queru
e0d4dbad5a
am a4781e86: Merge from open-source gingerbread
...
* commit 'a4781e867f2e9115ce5b8085576bebf6505bfd00':
CTS: pass vogar expectation location to CollectAllTests.
2011-01-29 09:27:39 -08:00
Jean-Baptiste Queru
6e47f1cd0c
Merge 66888a7c
from gingerbread
...
Change-Id: Ieba42e9ecfaf6078d2c8442560119863a329fa06
2011-01-29 09:24:41 -08:00
Ying Wang
9851c52c4a
am a712543e: Don\'t prepend ./ before the dirs to be removed
...
* commit 'a712543ec35bd834ad52d47375ab7ec04b8ed3f7':
Don't prepend ./ before the dirs to be removed
2011-01-29 09:01:14 -08:00
Jean-Baptiste Queru
2a548e17ba
am 8ce964f4: am 2039512c: am 61356271: am e388ac10: Merge "Extra protobuf-related support"
...
* commit '8ce964f49db1ae53624847382e708f05d76a64a6':
Extra protobuf-related support
2011-01-29 08:35:19 -08:00
Jean-Baptiste Queru
12d87a3e3c
am ef7c96c9: am d3966412: am ab81ffe2: am 70b8941f: Merge "Add dnsproxyd to keep in sync with base init.rc"
...
* commit 'ef7c96c988a0c68c387bcbe7efa498c7066f4c34':
Add dnsproxyd to keep in sync with base init.rc
2011-01-29 08:35:14 -08:00
Jean-Baptiste Queru
f45103c464
am 563fb235: am 53cebd72: (-s ours) am ad3e0072: am 39f358b7: Merge "Protobuf compiler support in the build system"
...
* commit '563fb235fd91c479f32ced150c66b26ddca27281':
Protobuf compiler support in the build system
2011-01-29 08:35:12 -08:00
Jean-Baptiste Queru
8ce964f49d
am 2039512c: am 61356271: am e388ac10: Merge "Extra protobuf-related support"
...
* commit '2039512c305c8fb21cdce1e338fd36ebeec8ec85':
Extra protobuf-related support
2011-01-29 08:02:06 -08:00
Jean-Baptiste Queru
ef7c96c988
am d3966412: am ab81ffe2: am 70b8941f: Merge "Add dnsproxyd to keep in sync with base init.rc"
...
* commit 'd39664126ed27b816e91312d28b76218f6bd5efb':
Add dnsproxyd to keep in sync with base init.rc
2011-01-29 08:01:57 -08:00
Jean-Baptiste Queru
563fb235fd
am 53cebd72: (-s ours) am ad3e0072: am 39f358b7: Merge "Protobuf compiler support in the build system"
...
* commit '53cebd72f7bf4fcc430c42f5eb925fec4c77d209':
Protobuf compiler support in the build system
2011-01-29 08:01:55 -08:00
Ying Wang
3a7e4ccad9
Unify use of $(hide).
...
Change-Id: Ib7e17bbb4682caecce5812e63de872b676403d64
2011-01-28 14:14:47 -08:00
Jean-Baptiste Queru
483801dabd
am 06fc03d0: am 5a50ecee: am f273723f: am 1e0055fb: Merge "A few more grandfathered user tags"
...
* commit '06fc03d05d3c9d1af4170fb67fd8d074bf4d2f8c':
A few more grandfathered user tags
2011-01-28 09:28:19 -08:00
Jean-Baptiste Queru
06fc03d05d
am 5a50ecee: am f273723f: am 1e0055fb: Merge "A few more grandfathered user tags"
...
* commit '5a50ecee40fa2b5e49a8467b35509651f07fb3de':
A few more grandfathered user tags
2011-01-28 09:25:32 -08:00
Ying Wang
f5653d1cee
Regularize use of PRIVATE_CXX.
...
Change-Id: Ifc628c67b5fa142cec59187f89f2d39df81160b9
2011-01-27 20:08:34 -08:00
Ying Wang
a02d3d9f74
Break down the buge shell command line preparing whole static libraries.
...
This can fix the "@: command not found" messages, which is caused by "@"
in the middle of the shell command line.
Change-Id: I444827458045efcbc70a6e1e43bf4ee040e71b79
2011-01-27 18:48:00 -08:00
Jean-Baptiste Queru
2039512c30
am 61356271: am e388ac10: Merge "Extra protobuf-related support"
...
* commit '6135627140bd799ee56ba894b69a9455ca0af86a':
Extra protobuf-related support
2011-01-27 14:27:32 -08:00
Jean-Baptiste Queru
6135627140
am e388ac10: Merge "Extra protobuf-related support"
...
* commit 'e388ac10b9dfc39f7578b6d222652926265dcffd':
Extra protobuf-related support
2011-01-27 14:25:30 -08:00
Jean-Baptiste Queru
e388ac10b9
Merge "Extra protobuf-related support"
2011-01-27 14:19:04 -08:00
Jean-Baptiste Queru
d39664126e
am ab81ffe2: am 70b8941f: Merge "Add dnsproxyd to keep in sync with base init.rc"
...
* commit 'ab81ffe2defa3294e09b70372e2179db2377c894':
Add dnsproxyd to keep in sync with base init.rc
2011-01-27 13:57:47 -08:00
Jean-Baptiste Queru
ab81ffe2de
am 70b8941f: Merge "Add dnsproxyd to keep in sync with base init.rc"
...
* commit '70b8941f19440592938bdb5c453b16be4d1d8c31':
Add dnsproxyd to keep in sync with base init.rc
2011-01-27 13:55:02 -08:00
Jean-Baptiste Queru
c61d4c91b6
Extra protobuf-related support
...
Change-Id: I375d32f0bcb695ccb0603743133034941d584163
2011-01-27 13:49:30 -08:00
Jean-Baptiste Queru
70b8941f19
Merge "Add dnsproxyd to keep in sync with base init.rc"
2011-01-27 13:38:33 -08:00
Bruce Beare
d59072d4d4
Add dnsproxyd to keep in sync with base init.rc
...
Change-Id: I8785cb5a5297c3cc6f3b0152fcae578a9ea89e89
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
2011-01-27 13:32:47 -08:00
Jean-Baptiste Queru
53cebd72f7
am ad3e0072: am 39f358b7: Merge "Protobuf compiler support in the build system"
...
* commit 'ad3e00724d62e5def2f2552533a62a800e9f3ee9':
Protobuf compiler support in the build system
2011-01-27 13:32:03 -08:00
Jean-Baptiste Queru
ad3e00724d
am 39f358b7: Merge "Protobuf compiler support in the build system"
...
* commit '39f358b75f1c6a9a10823bf5e400d1ece0144a05':
Protobuf compiler support in the build system
2011-01-27 13:30:31 -08:00
Jean-Baptiste Queru
5a50ecee40
am f273723f: am 1e0055fb: Merge "A few more grandfathered user tags"
...
* commit 'f273723f7710bb127ee1026e05049e4ee5290c8a':
A few more grandfathered user tags
2011-01-27 13:22:36 -08:00
Jean-Baptiste Queru
f273723f77
am 1e0055fb: Merge "A few more grandfathered user tags"
...
* commit '1e0055fb91f7b8582cb2979c45532ae01bf7a779':
A few more grandfathered user tags
2011-01-27 13:16:50 -08:00
Jean-Baptiste Queru
39f358b75f
Merge "Protobuf compiler support in the build system"
2011-01-27 13:12:09 -08:00
Jean-Baptiste Queru
79ee7bf896
Protobuf compiler support in the build system
2011-01-27 12:44:30 -08:00
Jean-Baptiste Queru
1e0055fb91
Merge "A few more grandfathered user tags"
2011-01-27 12:17:52 -08:00
Jean-Baptiste Queru
2497b6109b
A few more grandfathered user tags
...
Change-Id: I57309b461ec2395da068961f976c904bd3474e88
2011-01-27 12:17:00 -08:00
Doug Zongker
4f471d48b1
am 79cad63f: am b54972c9: Merge "fix check_target_files_signatures" into honeycomb
...
* commit '79cad63f61874f2d6f3fc4f931cd79c2a5f2a9a9':
fix check_target_files_signatures
2011-01-27 10:36:27 -08:00
Doug Zongker
79cad63f61
am b54972c9: Merge "fix check_target_files_signatures" into honeycomb
...
* commit 'b54972c90d0f8de8d74f93782c523aa211b1c8d7':
fix check_target_files_signatures
2011-01-27 10:34:36 -08:00
Doug Zongker
b54972c90d
Merge "fix check_target_files_signatures" into honeycomb
2011-01-27 10:32:16 -08:00
Doug Zongker
6ae5381670
fix check_target_files_signatures
...
common.UnzipTemp now returns a 2-tuple instead of just a string.
Bug: 3398407
Change-Id: Ifd0408283aaa15752caa549f4510a0a3db03c3fd
2011-01-27 10:20:27 -08:00
Jean-Baptiste Queru
464f5a9e22
am 6313b433: (-s ours) am 020e2fc1: (-s ours) am 928a0304: re-merge from readonly-korg-master - do not merge
...
* commit '6313b433edd0b00354ce9f9b40bbb6fd96352efd':
re-merge from readonly-korg-master - do not merge
2011-01-27 09:28:20 -08:00
Jean-Baptiste Queru
6313b433ed
am 020e2fc1: (-s ours) am 928a0304: re-merge from readonly-korg-master - do not merge
...
* commit '020e2fc14a28d6fd449fa37cf8bcbd4b0675238a':
re-merge from readonly-korg-master - do not merge
2011-01-27 09:26:44 -08:00
Jean-Baptiste Queru
020e2fc14a
am 928a0304: re-merge from readonly-korg-master - do not merge
...
* commit '928a03043187b7c4843b2c832b589c57b7541e4a':
re-merge from readonly-korg-master - do not merge
2011-01-27 09:24:43 -08:00
Jean-Baptiste Queru
928a030431
re-merge from readonly-korg-master - do not merge
...
Change-Id: Ifc1e39261e1fcaefc1e314d994e71115624643a2
2011-01-27 09:21:58 -08:00
Jean-Baptiste Queru
b681bf38fb
am ab17f6c1: (-s ours) am 46b944dd: (-s ours) am 1fe74722: am 4a91aa9b: (-s ours) Merge "Add a few more legacy modules that can have user tags - do not merge"
...
* commit 'ab17f6c1e69212e609f9d180361245d8c37108ff':
Add a few more legacy modules that can have user tags - do not merge
2011-01-27 09:00:24 -08:00
Jean-Baptiste Queru
ab17f6c1e6
am 46b944dd: (-s ours) am 1fe74722: am 4a91aa9b: (-s ours) Merge "Add a few more legacy modules that can have user tags - do not merge"
...
* commit '46b944dd76cfc752a23acd98d00c681fb2c22864':
Add a few more legacy modules that can have user tags - do not merge
2011-01-27 08:58:16 -08:00
Jean-Baptiste Queru
46b944dd76
am 1fe74722: am 4a91aa9b: (-s ours) Merge "Add a few more legacy modules that can have user tags - do not merge"
...
* commit '1fe74722b608a66381d186b32b2fb59d254194c7':
Add a few more legacy modules that can have user tags - do not merge
2011-01-27 08:55:43 -08:00