Commit Graph

4442 Commits

Author SHA1 Message Date
Raphael Moll
6b7b53cb36 Merge "SDK: Enable "make sdk/common" under Windows" 2011-02-03 10:45:50 -08:00
Jean-Baptiste Queru
4b35d1aba0 Fix x86 build.
Change-Id: I22dc39a68911e1b5846c20e63c0f8c59521ea7f5
2011-02-03 09:55:47 -08:00
Raphael
004f68f01c am 79e1d2cf: am 6b6e8114: am 4167b2ba: Merge "SDK: Strip llvm-rs-cc in SDK."
* commit '79e1d2cf99754f81137c0f390d0e1fd898e52277':
  SDK: Strip llvm-rs-cc in SDK.
2011-02-03 09:16:38 -08:00
Raphael
79e1d2cf99 am 6b6e8114: am 4167b2ba: Merge "SDK: Strip llvm-rs-cc in SDK."
* commit '6b6e8114810bb26a64e1d8d9814fdfadb90c3848':
  SDK: Strip llvm-rs-cc in SDK.
2011-02-03 09:05:07 -08:00
Raphael
6b6e811481 am 4167b2ba: Merge "SDK: Strip llvm-rs-cc in SDK."
* commit '4167b2bae58b445cfaf15291a7aa6b0ccd025596':
  SDK: Strip llvm-rs-cc in SDK.
2011-02-03 08:56:22 -08:00
Brian Swetland
a0c5bd7b4a am 70c822e7: am 678c7ac9: (-s ours) am d7798a7e: fix TINY ANDROID yet again...
* commit '70c822e7106ac97a1a2b4e5d404e54efc34ad344':
  fix TINY ANDROID yet again...
2011-02-02 16:25:01 -08:00
Raphael
ea55056f19 am 3e57da17: am 7a6a9c35: SDK: Strip llvm-rs-cc in SDK.
* commit '3e57da17d1bd1e61c440910fbb441ba6997314d9':
  SDK: Strip llvm-rs-cc in SDK.
2011-02-02 16:20:08 -08:00
Brian Swetland
70c822e710 am 678c7ac9: (-s ours) am d7798a7e: fix TINY ANDROID yet again...
* commit '678c7ac997ba5daf09664d3e9b26f1c4a493b99e':
  fix TINY ANDROID yet again...
2011-02-02 16:17:50 -08:00
Raphael Moll
192d1ef6d7 SDK: Enable "make sdk/common" under Windows
Change-Id: Id9cba159f434fb18f6e3b648954b3f8ddb580dc0
2011-02-02 15:59:46 -08:00
Raphael
3e57da17d1 am 7a6a9c35: SDK: Strip llvm-rs-cc in SDK.
* commit '7a6a9c3528d997a1cb3a03eca3c0c11b14792449':
  SDK: Strip llvm-rs-cc in SDK.
2011-02-02 15:52:40 -08:00
Brian Swetland
678c7ac997 am d7798a7e: fix TINY ANDROID yet again...
* commit 'd7798a7e1b3241c49d7c8325cf14ac608350b719':
  fix TINY ANDROID yet again...
2011-02-02 15:23:20 -08:00
Brian Swetland
d7798a7e1b fix TINY ANDROID yet again...
Change-Id: If52e1387c590be5ef467280ab2d1b56b8a823cd0
2011-02-02 15:20:50 -08:00
Raphael
4167b2bae5 Merge "SDK: Strip llvm-rs-cc in SDK." 2011-02-02 13:41:14 -08:00
Ed Heyl
9eec524e0a am 6ae30f98: Merge commit \'1eda8628\' into honeycomb-plus-aosp
* commit '6ae30f989d8da512924e954be4e7ef692d2b9a18':
  set ID back to honeycomb       (please do not merge)
2011-02-02 13:20:06 -08:00
Ed Heyl
6ae30f989d Merge commit '1eda8628' into honeycomb-plus-aosp
Change-Id: I07948d5d76f4a25ae93ebd6c7ba0d520ef5b61c0
2011-02-02 13:12:31 -08:00
Raphael
7a6a9c3528 SDK: Strip llvm-rs-cc in SDK.
SDK Bug: 3394374

Change-Id: I2b0e46d9f94d488611bd79193f4a11cc0f36be51
2011-02-02 12:05:31 -08:00
Raphael
39f4b566da SDK: Strip llvm-rs-cc in SDK.
SDK Bug: 3394374

Change-Id: I728112795ad40a31a1b4c476e043ef213241c617
2011-02-02 11:31:38 -08:00
Ed Heyl
1eda86286a set ID back to honeycomb (please do not merge)
Change-Id: I469ccbb2a556d3aeaedb9d0a89bda1d77aef6b90
2011-02-02 10:04:50 -08:00
Scott Main
6a1ca8b804 am 070336f3: am 463694a4: (-s ours) am 0fe9974c: cherrypick Change-Id: Ib8a7ae66f0dc6db6a2c8f2a79238d95e67c627f3 backport some style changes for notes from master to gb
* commit '070336f3a83680245517688e008254166cbaa6d8':
  cherrypick Change-Id: Ib8a7ae66f0dc6db6a2c8f2a79238d95e67c627f3 backport some style changes for notes from master to gb
2011-02-01 21:02:30 -08:00
Scott Main
070336f3a8 am 463694a4: (-s ours) am 0fe9974c: cherrypick Change-Id: Ib8a7ae66f0dc6db6a2c8f2a79238d95e67c627f3 backport some style changes for notes from master to gb
* commit '463694a4f54de3d16de21b7aa9a7030b73fbd2e5':
  cherrypick Change-Id: Ib8a7ae66f0dc6db6a2c8f2a79238d95e67c627f3 backport some style changes for notes from master to gb
2011-02-01 21:00:05 -08:00
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