Commit Graph

29428 Commits

Author SHA1 Message Date
Tao Bao e5609912f0 Revert "Revert "Build FUTILITY tool from futility-host."" am: 69ad150dd3 am: 56e0166eb8
am: 98eb433d99

Change-Id: I46ba148c7fbc07ab54d156c6f89397190f740203
2017-02-27 00:51:32 +00:00
Tao Bao 98eb433d99 Revert "Revert "Build FUTILITY tool from futility-host."" am: 69ad150dd3
am: 56e0166eb8

Change-Id: If27ca67f70d7d4f9d50a9abd8687fc2734a2c882
2017-02-27 00:48:03 +00:00
Tao Bao 56e0166eb8 Revert "Revert "Build FUTILITY tool from futility-host.""
am: 69ad150dd3

Change-Id: I380512827cde6d522ea2994cecf8045f66d242b9
2017-02-27 00:44:32 +00:00
Tao Bao 84ec323c9b Makefile: Add the missing dependency on FUTILITY. am: 1c4c8c4532 am: b9c4a17cf6
am: 6ea25dfd92

Change-Id: I97b524989ab24fae5ecf97c13c58e338062ce936
2017-02-26 18:51:10 +00:00
Tao Bao 6ea25dfd92 Makefile: Add the missing dependency on FUTILITY. am: 1c4c8c4532
am: b9c4a17cf6

Change-Id: I040d079e7d63c621cd18cb738fe1724b81274a26
2017-02-26 18:47:41 +00:00
Tao Bao b9c4a17cf6 Makefile: Add the missing dependency on FUTILITY.
am: 1c4c8c4532

Change-Id: I91adb6798764a78cba2e21072aea29dee532f157
2017-02-26 18:44:09 +00:00
Tao Bao 69ad150dd3 Revert "Revert "Build FUTILITY tool from futility-host.""
This reverts commit b9186f2b52.

The cause of the earlier breakage has been identified and fixed by
commit 4b577413ff.

Bug: 35467608
Test: lunch ryu-userdebug; m otatools-package
Change-Id: I0ca329a3844b7d5d74443f7495b363e0f1c1c391
(cherry picked from commit 9b524ef60d)
2017-02-25 08:38:30 -08:00
Tao Bao 1c4c8c4532 Makefile: Add the missing dependency on FUTILITY.
Bug: 35467608
Test: lunch aosp_dragon-userdebug; m dist
Change-Id: If3824ac22926f3c3cc09d5b82cb0f6da4132f937
(cherry picked from commit 4b577413ff)
2017-02-25 08:32:48 -08:00
Alain Vongsouvanh 1c50b8154d DO NOT MERGE releasetools: allow for multiple OEM property values.
This CL changes the --oem_settings flag to allow a comma seperated list of
property files. All property values will be used when asserting properties such
as ro.product.name.

For example, if two property files are provided with ro.product.name values of
"sprout" and "sprout_a", the resulting otapackage will check that the device's
ro.product.name property matches at least one of them.

Bug: 34191373
Test: manual

(cherry-picked and adapted from AOSP commit 7f804ba71f)

Change-Id: I954673511be8f0929982235cc9cbfbd85a9ee1f4
2017-02-22 02:00:13 +00:00
Tao Bao e64f52ebcd Merge "Revert "releasetools: Allow using futility-host to sign old TF.zip."" into nyc-dev am: b0df1ef7ac am: 983c979c25
am: bd6d03ab18

Change-Id: I488b164ae8c3a93858a293e2a538ff6b8742736c
2017-02-21 20:35:25 +00:00
Tao Bao bd6d03ab18 Merge "Revert "releasetools: Allow using futility-host to sign old TF.zip."" into nyc-dev am: b0df1ef7ac
am: 983c979c25

Change-Id: I938ee86611ea8c452c07324e2f3c6a9b0180cb7e
2017-02-21 20:33:25 +00:00
Tao Bao 983c979c25 Merge "Revert "releasetools: Allow using futility-host to sign old TF.zip."" into nyc-dev
am: b0df1ef7ac

Change-Id: I3924b44e75aa0f8f18129212dd80fd843f6a6a47
2017-02-21 20:31:25 +00:00
Tao Bao b0df1ef7ac Merge "Revert "releasetools: Allow using futility-host to sign old TF.zip."" into nyc-dev 2017-02-21 20:29:38 +00:00
Tao Bao d6145b6a16 Revert "releasetools: Allow using futility-host to sign old TF.zip."
Broke ryu targets.

This reverts commit 31a0de00a4.

Change-Id: I3ffcdc604a1cb92c86c574b5cd358d0148430d55
2017-02-21 20:27:27 +00:00
Tao Bao 9c1f17ba6f Merge "Revert "Build FUTILITY tool from futility-host."" into nyc-dev am: 683f58096d am: 5636426646
am: dcaa3eb7dd

Change-Id: I55c02f7b10bc5a285c841de3a9c20dd5768a5e77
2017-02-21 19:02:47 +00:00
Tao Bao dcaa3eb7dd Merge "Revert "Build FUTILITY tool from futility-host."" into nyc-dev am: 683f58096d
am: 5636426646

Change-Id: Icf01db86b950d2ebd7241448d9cc680e118afc71
2017-02-21 19:00:47 +00:00
Tao Bao 5636426646 Merge "Revert "Build FUTILITY tool from futility-host."" into nyc-dev
am: 683f58096d

Change-Id: Iec1997b1671bacda94206deeff28a8c8c7048d36
2017-02-21 18:58:47 +00:00
Tao Bao 683f58096d Merge "Revert "Build FUTILITY tool from futility-host."" into nyc-dev 2017-02-21 18:55:34 +00:00
Tao Bao b9186f2b52 Revert "Build FUTILITY tool from futility-host."
Broke ryu targets.

This reverts commit a7726c1e36.

Change-Id: Icec9da939a50c794b15ba3f40e8307f8829254c7
2017-02-21 18:44:24 +00:00
Tao Bao 79d719b313 releasetools: Allow using futility-host to sign old TF.zip. am: 31a0de00a4 am: a9bdf8716f
am: ae2f5abf06

Change-Id: I514c69dca1aede0fe047682dab9b11e7263d7634
2017-02-21 17:48:16 +00:00
Tao Bao ebd498acc6 Build FUTILITY tool from futility-host. am: a7726c1e36 am: 7459fbc169
am: 26e8fa493c

Change-Id: Icd2ad9d62bc9e4ad33f053bf30a77e6641bc4f4b
2017-02-21 17:48:10 +00:00
Tao Bao ae2f5abf06 releasetools: Allow using futility-host to sign old TF.zip. am: 31a0de00a4
am: a9bdf8716f

Change-Id: I411b26baf0cd7d74ec6c8c80a12f0499d017a360
2017-02-21 17:46:45 +00:00
Tao Bao 26e8fa493c Build FUTILITY tool from futility-host. am: a7726c1e36
am: 7459fbc169

Change-Id: I5807a90dd5b953d0fe735c1263463fcb33cae06f
2017-02-21 17:46:41 +00:00
Tao Bao a9bdf8716f releasetools: Allow using futility-host to sign old TF.zip.
am: 31a0de00a4

Change-Id: I46041e6e5e37c451f8f23dca773850c025aa18b2
2017-02-21 17:45:15 +00:00
Tao Bao 7459fbc169 Build FUTILITY tool from futility-host.
am: a7726c1e36

Change-Id: I681c3ed4de19bd4c2bca398876806e2ef25087c3
2017-02-21 17:45:10 +00:00
Tao Bao 31a0de00a4 releasetools: Allow using futility-host to sign old TF.zip.
Commit e98fb7a8d3 switched to using
futility-host instead of the prebuilt futility. This CL adds support to
handle signing old TF.zip that still says "futility=prebuilt/..." in
META/misc_info.txt.

Bug: 35467608
Test: Generate otatools.zip and sign an old ryu TF.zip.
Change-Id: I48a9cc918c7afce361e1ec9bc4f85f74fa92566e
(cherry picked from commit 4f104d1b94)
2017-02-17 23:36:00 -08:00
Tao Bao a7726c1e36 Build FUTILITY tool from futility-host.
Also pack the tool, vboot_signer.sh script and the test keys into
otatools.zip. This allows signing ryu target without a source repo.

Bug: 35467608
Test: m otatools-package and check the newly included files.
Test: Use otatools.zip to sign a ryu target.
Change-Id: I70f7b359f21a579463d5c7251daac81a97e338cc
(cherry picked from commit e98fb7a8d3)
2017-02-17 23:35:40 -08:00
Adam Seaton 3ce06ee405 [DO NOT MERGE] Updating Security String to 2017-04-05 on klp-dev am: 502366cdc4 am: 3ce29b8a94 am: b0cef41b76 -s ours am: 8f86884a97 -s ours am: c901cec8b2 am: a150db6547 -s ours am: 28ecd6fdd5 am: 58300f46bf am: 764c206e6d am: 533ca31c93 -s ours am: 4a18b463ab am: 1cfaef4241
am: 4fae3e67ef

Change-Id: Ide31be66e4839fdd68aa0951d053867a12438593
2017-02-13 23:46:46 +00:00
Adam Seaton e62cac071f [DO NOT MERGE] Update Security String to 2017-04-01 on klp-dev am: 00c627eb31 am: 5be6d3bbb4 am: ed38784898 -s ours am: 84702d9919 -s ours am: d466175346 am: bc19d8140c -s ours am: 53a64664c9 am: caff84dcbe am: 2f222829e0 am: 69586d29d7 -s ours am: 8f510b8ca1 am: 34f2511b65
am: 8bc2b6dc86

Change-Id: Ic492a8cef30dd339e14180f9d31b151acf14df2c
2017-02-13 23:46:39 +00:00
Adam Seaton 4fae3e67ef [DO NOT MERGE] Updating Security String to 2017-04-05 on klp-dev am: 502366cdc4 am: 3ce29b8a94 am: b0cef41b76 -s ours am: 8f86884a97 -s ours am: c901cec8b2 am: a150db6547 -s ours am: 28ecd6fdd5 am: 58300f46bf am: 764c206e6d am: 533ca31c93 -s ours am: 4a18b463ab
am: 1cfaef4241

Change-Id: I0e5fc301e64ed9c0e6055a180b53c479294cd072
2017-02-13 23:43:47 +00:00
Adam Seaton 8bc2b6dc86 [DO NOT MERGE] Update Security String to 2017-04-01 on klp-dev am: 00c627eb31 am: 5be6d3bbb4 am: ed38784898 -s ours am: 84702d9919 -s ours am: d466175346 am: bc19d8140c -s ours am: 53a64664c9 am: caff84dcbe am: 2f222829e0 am: 69586d29d7 -s ours am: 8f510b8ca1
am: 34f2511b65

Change-Id: I561a133a3b4dffd00e572a4d78e48e9f5fb068a8
2017-02-13 23:43:39 +00:00
Adam Seaton 1cfaef4241 [DO NOT MERGE] Updating Security String to 2017-04-05 on klp-dev am: 502366cdc4 am: 3ce29b8a94 am: b0cef41b76 -s ours am: 8f86884a97 -s ours am: c901cec8b2 am: a150db6547 -s ours am: 28ecd6fdd5 am: 58300f46bf am: 764c206e6d am: 533ca31c93 -s ours
am: 4a18b463ab

Change-Id: Ia0b3eb95e0a8e3ed6f8abd5d9b36a081a62d9598
2017-02-13 23:40:47 +00:00
Adam Seaton 21f6e17ffd [DO NOT MERGE] Update Security String to 2017-04-05 on lmp-dev am: e2eff3f7ee -s ours am: ea757ba690 am: 37aab729cf -s ours am: 8a59a2eda2 am: 3746e17d30 am: b15a2623ac am: 4be162ac7f -s ours am: c8b7e08b50 am: 3e0d1c32da
am: 437c3dd5d3

Change-Id: I2f1bcd2e3c7e40013769429f2214188a82cd7ae9
2017-02-13 23:40:47 +00:00
Adam Seaton 34f2511b65 [DO NOT MERGE] Update Security String to 2017-04-01 on klp-dev am: 00c627eb31 am: 5be6d3bbb4 am: ed38784898 -s ours am: 84702d9919 -s ours am: d466175346 am: bc19d8140c -s ours am: 53a64664c9 am: caff84dcbe am: 2f222829e0 am: 69586d29d7 -s ours
am: 8f510b8ca1

Change-Id: I76e4a8e5ef538561bdf93a0b62d5ebb9171288b3
2017-02-13 23:40:39 +00:00
Adam Seaton 85782debf1 [DO NOT MERGE] Update Security String to 2017-04-01 on lmp-dev am: ffab69998a -s ours am: 0f30aa9801 am: 05ebddebe5 -s ours am: 101c043b17 am: 58086ff4aa am: fec9d76740 am: ea0d4b0e54 -s ours am: 45deda3682 am: 235702c0e0
am: 6063089d07

Change-Id: Ide2b5e8584c58e17b9026a9ab5fbb6d3dc2d7e62
2017-02-13 23:40:39 +00:00
Adam Seaton 4a18b463ab [DO NOT MERGE] Updating Security String to 2017-04-05 on klp-dev am: 502366cdc4 am: 3ce29b8a94 am: b0cef41b76 -s ours am: 8f86884a97 -s ours am: c901cec8b2 am: a150db6547 -s ours am: 28ecd6fdd5 am: 58300f46bf am: 764c206e6d
am: 533ca31c93  -s ours

Change-Id: Ieb70f91622319054da2c811e2d0abecd4125ed9d
2017-02-13 23:38:42 +00:00
Adam Seaton 8f510b8ca1 [DO NOT MERGE] Update Security String to 2017-04-01 on klp-dev am: 00c627eb31 am: 5be6d3bbb4 am: ed38784898 -s ours am: 84702d9919 -s ours am: d466175346 am: bc19d8140c -s ours am: 53a64664c9 am: caff84dcbe am: 2f222829e0
am: 69586d29d7  -s ours

Change-Id: I170ef47942f401b2157fac0e5b64b62248af51f7
2017-02-13 23:38:38 +00:00
Adam Seaton 437c3dd5d3 [DO NOT MERGE] Update Security String to 2017-04-05 on lmp-dev am: e2eff3f7ee -s ours am: ea757ba690 am: 37aab729cf -s ours am: 8a59a2eda2 am: 3746e17d30 am: b15a2623ac am: 4be162ac7f -s ours am: c8b7e08b50
am: 3e0d1c32da

Change-Id: I73ecc8e0accf6e9b5e4191c4b2b4dbfa56411535
2017-02-13 23:38:17 +00:00
Adam Seaton 6063089d07 [DO NOT MERGE] Update Security String to 2017-04-01 on lmp-dev am: ffab69998a -s ours am: 0f30aa9801 am: 05ebddebe5 -s ours am: 101c043b17 am: 58086ff4aa am: fec9d76740 am: ea0d4b0e54 -s ours am: 45deda3682
am: 235702c0e0

Change-Id: Ic0442a16d81e24c3fdc2ebb9b33b9dddc729fa8e
2017-02-13 23:38:09 +00:00
Adam Seaton 3e0d1c32da [DO NOT MERGE] Update Security String to 2017-04-05 on lmp-dev am: e2eff3f7ee -s ours am: ea757ba690 am: 37aab729cf -s ours am: 8a59a2eda2 am: 3746e17d30 am: b15a2623ac am: 4be162ac7f -s ours
am: c8b7e08b50

Change-Id: If5eb4d814e848612bea0d801df053510e57ae303
2017-02-13 23:35:46 +00:00
Adam Seaton 533ca31c93 [DO NOT MERGE] Updating Security String to 2017-04-05 on klp-dev am: 502366cdc4 am: 3ce29b8a94 am: b0cef41b76 -s ours am: 8f86884a97 -s ours am: c901cec8b2 am: a150db6547 -s ours am: 28ecd6fdd5 am: 58300f46bf
am: 764c206e6d

Change-Id: Iebaf610eaf7eb44a2bf5b2c29b76eec0d35f2e3b
2017-02-13 23:35:44 +00:00
Adam Seaton 235702c0e0 [DO NOT MERGE] Update Security String to 2017-04-01 on lmp-dev am: ffab69998a -s ours am: 0f30aa9801 am: 05ebddebe5 -s ours am: 101c043b17 am: 58086ff4aa am: fec9d76740 am: ea0d4b0e54 -s ours
am: 45deda3682

Change-Id: I7b07e9e6d95d9fa6e783ddde5eda3b4b6c0e8727
2017-02-13 23:35:40 +00:00
Adam Seaton 69586d29d7 [DO NOT MERGE] Update Security String to 2017-04-01 on klp-dev am: 00c627eb31 am: 5be6d3bbb4 am: ed38784898 -s ours am: 84702d9919 -s ours am: d466175346 am: bc19d8140c -s ours am: 53a64664c9 am: caff84dcbe
am: 2f222829e0

Change-Id: Ia195157ac55b1bfa35c206614a813f3e1585134f
2017-02-13 23:35:39 +00:00
Adam Seaton 764c206e6d [DO NOT MERGE] Updating Security String to 2017-04-05 on klp-dev am: 502366cdc4 am: 3ce29b8a94 am: b0cef41b76 -s ours am: 8f86884a97 -s ours am: c901cec8b2 am: a150db6547 -s ours am: 28ecd6fdd5
am: 58300f46bf

Change-Id: If3f378886a2a36d0af478f6a44d8db64e83832a8
2017-02-13 23:32:13 +00:00
Adam Seaton c8b7e08b50 [DO NOT MERGE] Update Security String to 2017-04-05 on lmp-dev am: e2eff3f7ee -s ours am: ea757ba690 am: 37aab729cf -s ours am: 8a59a2eda2 am: 3746e17d30 am: b15a2623ac
am: 4be162ac7f  -s ours

Change-Id: I3b52aeff547b3c2cd4c3448029f28ec79f0fa592
2017-02-13 23:32:12 +00:00
Adam Seaton 2f222829e0 [DO NOT MERGE] Update Security String to 2017-04-01 on klp-dev am: 00c627eb31 am: 5be6d3bbb4 am: ed38784898 -s ours am: 84702d9919 -s ours am: d466175346 am: bc19d8140c -s ours am: 53a64664c9
am: caff84dcbe

Change-Id: I49c8960797099da97ab452e91e7c3d4ecfde3d4f
2017-02-13 23:32:08 +00:00
Adam Seaton 45deda3682 [DO NOT MERGE] Update Security String to 2017-04-01 on lmp-dev am: ffab69998a -s ours am: 0f30aa9801 am: 05ebddebe5 -s ours am: 101c043b17 am: 58086ff4aa am: fec9d76740
am: ea0d4b0e54  -s ours

Change-Id: I5ee2a63e6af746efd35e1aaa978345e2d505b7aa
2017-02-13 23:32:07 +00:00
Adam Seaton 7beb2d6bff [DO NOT MERGE] Update Security String to 2017-04-05 for mnc-dev am: af15999c69 am: f23c50fe08 am: ed7c7adb7e am: 46594018ce -s ours am: acc43b9d4d am: cb57c6426e
am: 5db0a5f30d

Change-Id: Ib0eaf8802276444c611e51e2fd26a5b02c8651f6
2017-02-13 23:29:43 +00:00
Adam Seaton 58300f46bf [DO NOT MERGE] Updating Security String to 2017-04-05 on klp-dev am: 502366cdc4 am: 3ce29b8a94 am: b0cef41b76 -s ours am: 8f86884a97 -s ours am: c901cec8b2 am: a150db6547 -s ours
am: 28ecd6fdd5

Change-Id: I9d39e4f7cce7dcf22f9cb4291da89f5d1107c305
2017-02-13 23:29:43 +00:00
Adam Seaton 4be162ac7f [DO NOT MERGE] Update Security String to 2017-04-05 on lmp-dev am: e2eff3f7ee -s ours am: ea757ba690 am: 37aab729cf -s ours am: 8a59a2eda2 am: 3746e17d30
am: b15a2623ac

Change-Id: I5b374785d84f6affc879a4bbd0705f1c6d09e0fa
2017-02-13 23:29:42 +00:00