Commit Graph

29177 Commits

Author SHA1 Message Date
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 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
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 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 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 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 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 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 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 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
Adam Seaton caff84dcbe [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

Change-Id: I9241ca2872d5b44869daa89e61be0dc99c42c8f7
2017-02-13 23:29:38 +00:00
Adam Seaton ea0d4b0e54 [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

Change-Id: I70bd052bfddbd2cd926bc547a54d4831d63831f1
2017-02-13 23:29:37 +00:00
Adam Seaton b15a2623ac [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

Change-Id: I0289dd868164312ae2702b57893e160e60fcdfee
2017-02-13 23:26:41 +00:00
Adam Seaton 28ecd6fdd5 [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

Change-Id: I8f82b3f68accb57beaeb25dd88b057062597bfdf
2017-02-13 23:26:40 +00:00
Adam Seaton 53a64664c9 [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

Change-Id: I7a7a9e0fa88aa5f1e70ad62bd5c1854eae885a1b
2017-02-13 23:26:37 +00:00
Adam Seaton fec9d76740 [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

Change-Id: Ia7831d78a8cb2f0604051b5297b2f3236e1ae36f
2017-02-13 23:26:37 +00:00
Adam Seaton cb57c6426e [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

Change-Id: I7ef4564d7904ae2f6bf3d4d18701fbb9e58a1319
2017-02-13 23:24:44 +00:00
Adam Seaton a150db6547 [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

Change-Id: Ie35c57a24abb4638ac3372d42913d3e4cad5410a
2017-02-13 23:24:42 +00:00
Adam Seaton bc19d8140c [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

Change-Id: I0fc9d82d3181bbf98cc5c35bd7f0be9c593b785d
2017-02-13 23:24:37 +00:00
Adam Seaton 89005ae01c [DO NOT MERGE] Update Security String to 2017-04-01 for mnc-dev am: 06a57496e6 am: a3e5f184eb am: 775af5ae5b am: 6ebebd3ee3 -s ours
am: 8dd075b1c0

Change-Id: Id946441c5f667c756397327f03223b4f5d0660a3
2017-02-13 23:24:37 +00:00
Adam Seaton 3746e17d30 [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

Change-Id: Ieec27d7f6fda4f30bfb1f94d43a48da75bf7cc73
2017-02-13 23:24:15 +00:00
Adam Seaton 58086ff4aa [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

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

Change-Id: If700d4cf2d0133dc4114aba1fdeb7001d4c1f2e6
2017-02-13 23:21:40 +00:00
Adam Seaton 8a59a2eda2 [DO NOT MERGE] Update Security String to 2017-04-05 on lmp-dev am: e2eff3f7ee -s ours am: ea757ba690
am: 37aab729cf  -s ours

Change-Id: I8b884d67b4d9b1e430937f66a4b2743812970de1
2017-02-13 23:21:40 +00:00
Adam Seaton c901cec8b2 [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

Change-Id: I46d21630e67552086c193d65d78d86e8b96872d1
2017-02-13 23:21:40 +00:00
Adam Seaton d466175346 [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

Change-Id: I872c7ff88088a3f7417aa5a1afec4856b21a8803
2017-02-13 23:21:36 +00:00
Adam Seaton 8dd075b1c0 [DO NOT MERGE] Update Security String to 2017-04-01 for mnc-dev am: 06a57496e6 am: a3e5f184eb am: 775af5ae5b
am: 6ebebd3ee3  -s ours

Change-Id: Icc3ceb4098f8f95b60ba8655d40bb50aa188ff3f
2017-02-13 23:21:36 +00:00
Adam Seaton 101c043b17 [DO NOT MERGE] Update Security String to 2017-04-01 on lmp-dev am: ffab69998a -s ours am: 0f30aa9801
am: 05ebddebe5  -s ours

Change-Id: Ic61760aacd2b93abe2dddfb4254911c1b055dd0d
2017-02-13 23:21:36 +00:00
Adam Seaton 46594018ce [DO NOT MERGE] Update Security String to 2017-04-05 for mnc-dev am: af15999c69 am: f23c50fe08
am: ed7c7adb7e

Change-Id: Ic49d0b79e0ed810e4c89e87f7bd77ab86723a39a
2017-02-13 23:18:41 +00:00
Adam Seaton 37aab729cf [DO NOT MERGE] Update Security String to 2017-04-05 on lmp-dev am: e2eff3f7ee -s ours
am: ea757ba690

Change-Id: I98681c4fab9d411ea71e598d92349fabfb5ac207
2017-02-13 23:18:40 +00:00
Adam Seaton 8f86884a97 [DO NOT MERGE] Updating Security String to 2017-04-05 on klp-dev am: 502366cdc4 am: 3ce29b8a94
am: b0cef41b76  -s ours

Change-Id: Ia5ab2a5e1fb3a168a28b039de6ba1028352b09d1
2017-02-13 23:18:39 +00:00
Adam Seaton 6ebebd3ee3 [DO NOT MERGE] Update Security String to 2017-04-01 for mnc-dev am: 06a57496e6 am: a3e5f184eb
am: 775af5ae5b

Change-Id: I8cff31a4fd9f090b385a3c8a23f028a0f6f53a49
2017-02-13 23:18:36 +00:00