Scott Main
463694a4f5
am 0fe9974c: cherrypick Change-Id: Ib8a7ae66f0dc6db6a2c8f2a79238d95e67c627f3 backport some style changes for notes from master to gb
...
* commit '0fe9974c38e41a2aa386d5744d1a75d8bd26b1bc':
cherrypick Change-Id: Ib8a7ae66f0dc6db6a2c8f2a79238d95e67c627f3 backport some style changes for notes from master to gb
2011-02-01 20:52:23 -08:00
Scott Main
0fe9974c38
cherrypick Change-Id: Ib8a7ae66f0dc6db6a2c8f2a79238d95e67c627f3
...
backport some style changes for notes from master to gb
Change-Id: I4a7c6cfcadade5d90069ecab1edc694cb333430e
2011-02-01 20:37:20 -08:00
Ying Wang
0864d01001
am 9bc858c4: am 9c0f3e35: Build only userdata.img.
...
* commit '9bc858c4fd765366a64cfe2021b8694b4aac82f8':
Build only userdata.img.
2011-02-01 16:39:03 -08:00
Ying Wang
9bc858c4fd
am 9c0f3e35: Build only userdata.img.
...
* commit '9c0f3e355194d1c43bf70f35f953d6a2babc815a':
Build only userdata.img.
2011-02-01 16:37:30 -08:00
Doug Zongker
e82906500b
Merge "support TARGET_EXTRA_RECOVERY_KEYS"
2011-02-01 16:05:31 -08:00
Ying Wang
9c0f3e3551
Build only userdata.img.
...
Use build command like:
$make -j16 showcommands userdataimage dist TARGET_PRODUCT=trygon_with_data_preloaded TARGET_BUILD_VARIANT=user
Change-Id: I964490e03090c3696d1595c92363273e35cfaed7
2011-02-01 14:59:12 -08:00
Doug Zongker
e121d6acf4
support TARGET_EXTRA_RECOVERY_KEYS
...
Specifying one or more key files (without .x509.pem extension) as
TARGET_EXTRA_RECOVERY_KEYS causes them to be included as acceptable
keys for recovery packages. They are *not* included in otacerts.zip,
so actual downloaded over-the-air packages can't use them, but they
can be used to sign sideload-only packages.
Bug: 3413359
Change-Id: I6f248ffa35f0c6b125dd8a7517493017e236c776
2011-02-01 14:13:52 -08:00
Ying Wang
5b316b604d
Fix dependency of prebuilt target non-static Java libraries.
...
Change-Id: I498b96ce737e5fc9076de39108252284ee53218f
2011-02-01 13:07:01 -08:00
Scott Main
91aea02de8
am f1813105: am e104f773: Merge "docs: modify style for toggle stuff so text isn\'t blue" into honeycomb
...
* commit 'f1813105701aba194464e1f6206330c4ffff25fd':
docs: modify style for toggle stuff so text isn't blue
2011-02-01 10:07:30 -08:00
Scott Main
f181310570
am e104f773: Merge "docs: modify style for toggle stuff so text isn\'t blue" into honeycomb
...
* commit 'e104f7731807c28d6c23eef7b88e1f53e1f7484a':
docs: modify style for toggle stuff so text isn't blue
2011-01-31 18:52:09 -08:00
Scott Main
e104f77318
Merge "docs: modify style for toggle stuff so text isn't blue" into honeycomb
2011-01-31 17:51:13 -08:00
Scott Main
219687b25c
docs: modify style for toggle stuff so text isn't blue
...
Change-Id: Ief363bf67d4e0c0fc1a8e79d4b02474c475c88ac
2011-01-31 17:24:07 -08:00
Jean-Baptiste Queru
4a38d8b62d
am 407b249e: am e29ef594: (-s ours) Merge from open-source master
...
* commit '407b249e788f83b326376fef377e1f33ea054840':
partial build fix
partial build fix
2011-01-31 15:46:34 -08:00
Jean-Baptiste Queru
407b249e78
am e29ef594: (-s ours) Merge from open-source master
...
* commit 'e29ef594e6836cdeee09de51f3a4b9af11cdabff':
partial build fix
partial build fix
2011-01-31 15:19:58 -08:00
Jean-Baptiste Queru
e29ef594e6
Merge from open-source master
...
Change-Id: Id74236b5a2b2717bbe45c684573106555c7d9ad2
2011-01-31 15:14:54 -08:00
Brett Chabot
e5baeada4d
am 9f686c99: am 2aad7a5b: Merge "Add cts-tradefed to cts build." into honeycomb
...
* commit '9f686c996bb45f0d377342fadfd20f5ae7a640de':
Add cts-tradefed to cts build.
2011-01-31 15:00:44 -08:00
Brett Chabot
9f686c996b
am 2aad7a5b: Merge "Add cts-tradefed to cts build." into honeycomb
...
* commit '2aad7a5beae2b308332270c27645f45674303a77':
Add cts-tradefed to cts build.
2011-01-31 13:59:58 -08:00
Jean-Baptiste Queru
00aef60ada
am 2d946f7a: Merge "partial build fix"
...
* commit '2d946f7ac9a74870271179d5d7a16a5f9ed61641':
partial build fix
2011-01-31 13:50:10 -08:00
Jean-Baptiste Queru
2a65eda5b6
am de50cfb5: Merge "partial build fix"
...
* commit 'de50cfb5f961a1ad4ceeeec2108147555fea0e22':
partial build fix
2011-01-31 13:50:07 -08:00
Brett Chabot
2aad7a5bea
Merge "Add cts-tradefed to cts build." into honeycomb
2011-01-31 13:42:11 -08:00
Jean-Baptiste Queru
2d946f7ac9
Merge "partial build fix"
2011-01-31 13:00:23 -08:00
Jean-Baptiste Queru
83e2f942b6
partial build fix
...
Change-Id: I831c4c646eca96c6513018fbc5ad88970b942775
2011-01-31 12:59:54 -08:00
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