Marco Nelissen
d787924736
DO NOT MERGE increase generic_mips system partition am: 7824073a36 -s ours am: 0c041e9ada am: 29ee191947 -s ours am: 16ee67f1a7 am: 8fc84f4de0 am: 7474d313f9 am: ac0ca8f326 -s ours am: 58c4e2e48a am: 32711700ab am: 38ae17c46d
...
am: 85e78564d3
2016-12-02 17:07:06 +00:00
Marco Nelissen
85e78564d3
DO NOT MERGE increase generic_mips system partition am: 7824073a36 -s ours am: 0c041e9ada am: 29ee191947 -s ours am: 16ee67f1a7 am: 8fc84f4de0 am: 7474d313f9 am: ac0ca8f326 -s ours am: 58c4e2e48a am: 32711700ab
...
am: 38ae17c46d
2016-12-02 17:00:05 +00:00
Marco Nelissen
38ae17c46d
DO NOT MERGE increase generic_mips system partition am: 7824073a36 -s ours am: 0c041e9ada am: 29ee191947 -s ours am: 16ee67f1a7 am: 8fc84f4de0 am: 7474d313f9 am: ac0ca8f326 -s ours am: 58c4e2e48a
...
am: 32711700ab
2016-12-02 16:53:05 +00:00
Tao Bao
3014c885b2
Build recovery-two-step.img for two-step OTAs. am: 47ec5ab561
...
am: eb9de30596
2016-12-02 16:53:04 +00:00
Marco Nelissen
32711700ab
DO NOT MERGE increase generic_mips system partition am: 7824073a36 -s ours am: 0c041e9ada am: 29ee191947 -s ours am: 16ee67f1a7 am: 8fc84f4de0 am: 7474d313f9 am: ac0ca8f326 -s ours
...
am: 58c4e2e48a
2016-12-02 16:46:34 +00:00
Tao Bao
eb9de30596
Build recovery-two-step.img for two-step OTAs.
...
am: 47ec5ab561
2016-12-02 16:46:33 +00:00
Marco Nelissen
58c4e2e48a
DO NOT MERGE increase generic_mips system partition am: 7824073a36 -s ours am: 0c041e9ada am: 29ee191947 -s ours am: 16ee67f1a7 am: 8fc84f4de0 am: 7474d313f9
...
am: ac0ca8f326
2016-12-02 16:39:32 +00:00
Marco Nelissen
ac0ca8f326
DO NOT MERGE increase generic_mips system partition am: 7824073a36 -s ours am: 0c041e9ada am: 29ee191947 -s ours am: 16ee67f1a7 am: 8fc84f4de0
...
am: 7474d313f9
2016-12-02 16:32:04 +00:00
Marco Nelissen
7474d313f9
DO NOT MERGE increase generic_mips system partition am: 7824073a36 -s ours am: 0c041e9ada am: 29ee191947 -s ours am: 16ee67f1a7
...
am: 8fc84f4de0
2016-12-02 16:24:32 +00:00
Marco Nelissen
8fc84f4de0
DO NOT MERGE increase generic_mips system partition am: 7824073a36 -s ours am: 0c041e9ada am: 29ee191947 -s ours
...
am: 16ee67f1a7
2016-12-02 16:17:32 +00:00
Marco Nelissen
16ee67f1a7
DO NOT MERGE increase generic_mips system partition am: 7824073a36 -s ours am: 0c041e9ada
...
am: 29ee191947
2016-12-02 16:10:01 +00:00
Marco Nelissen
29ee191947
DO NOT MERGE increase generic_mips system partition am: 7824073a36 -s ours
...
am: 0c041e9ada
2016-12-02 16:03:01 +00:00
Marco Nelissen
0c041e9ada
DO NOT MERGE increase generic_mips system partition
...
am: 7824073a36
2016-12-02 15:55:30 +00:00
Tao Bao
47ec5ab561
Build recovery-two-step.img for two-step OTAs.
...
In two-step OTAs, we write recovery image to /boot as the first step so
that we can reboot from there and install a new recovery image to
/recovery. However, bootloader will show "Your device is corrupt"
message when booting /boot with the recovery image. Because the recovery
image encodes the path of "/recovery" as part of the signature metadata,
which fails the verified boot.
This CL generates a special "recovery-two-step.img" in addition to the
regular recovery.img. This image encodes "/boot" when being signed,
which will be flashed to /boot at stage 1/3 in a two-step OTA.
Here are the desired changes:
- 'IMAGES/recovery-two-step.img' exists in target_files.zip for non-A/B
targets (e.g. bullhead). The image should not exist for targets that
don't have a recovery partition (e.g. A/B devices like sailfish).
- <device>-img.zip should not contain 'recovery-two-step.img'.
- Nothing should change when building non-two-step OTAs. For two-step
OTAs, 'recovery-two-step.img' should be included in the OTA package;
'updater-script' should flash this image to /boot at stage 1/3.
- When building a two-step OTA with an input TF.zip that doesn't have
IMAGES/recovery-two-step.img, it should use the existing
IMAGES/recovery.img instead.
Bug: 32986477
Test: Tested the steps above on bullhead and sailfish.
Change-Id: I34e6c599bcf2011d4cd5c926999418b3975d6d0f
(cherry picked from commit d42e97ebb4
2016-12-01 17:55:44 -08:00
Marco Nelissen
7824073a36
DO NOT MERGE increase generic_mips system partition
...
Increase system partition from 750MB to 768MB to fix
sdk_google_phone_mips build.
Change-Id: I35a60767a3dea7b1ce3c97246f4a038c98f5cb06
2016-11-30 13:14:13 -08:00
Tao Bao
2696b7107c
Makefile: Pack verity_verifier into otatools.zip. am: 7bb3aff71c am: ad8924117d am: 7981d953a9
...
am: 41fd473e45
2016-11-29 00:28:06 +00:00
Tao Bao
41fd473e45
Makefile: Pack verity_verifier into otatools.zip. am: 7bb3aff71c am: ad8924117d
...
am: 7981d953a9
2016-11-29 00:24:05 +00:00
Tao Bao
7981d953a9
Makefile: Pack verity_verifier into otatools.zip. am: 7bb3aff71c
...
am: ad8924117d
2016-11-29 00:19:36 +00:00
Tao Bao
ad8924117d
Makefile: Pack verity_verifier into otatools.zip.
...
am: 7bb3aff71c
2016-11-29 00:15:05 +00:00
Tao Bao
7bb3aff71c
Makefile: Pack verity_verifier into otatools.zip.
...
verity_verifier is needed when verifying verity metadata.
Bug: 32173582
Test: `m otatools-package`
Change-Id: I63fdeb75cdca10ea38c1df978d64701acdd4c1db
(cherry picked from commit 7f02f3413b
2016-11-28 10:05:45 -08:00
Ian Pedowitz
fc0189fec2
Adding in some documentation to ensure files are updated as needed
...
Also pulls forward the comments added in 9a3d92f719
2016-11-23 14:55:20 -08:00
Zheng Zhang
0668a16cba
Merge "DO NOT MERGE: build_image: add padding to match partition size" into cw-f-dev
...
am: 28b96d1470
2016-11-20 06:27:04 +00:00
Sami Tolvanen
628e032773
DO NOT MERGE: build_image: add padding to match partition size
...
am: 9a675c94d3
2016-11-20 06:26:56 +00:00
Zheng Zhang
28b96d1470
Merge "DO NOT MERGE: build_image: add padding to match partition size" into cw-f-dev
2016-11-20 06:22:17 +00:00
Adam Seaton
b33fdb4c49
Merge changes I30f397b0,I717a6f03 into lmp-dev am: 1a242b67fe am: 27ac4ac1da am: ac64c64f9a am: 618f64d183 am: d635edfd04 am: 6f0c3f4bdc am: c5ecbe4047 am: 4a45d769e9 am: e033ae9cff am: 8185ca3cd3
...
am: 777b8bb190
2016-11-17 19:58:33 +00:00
Adam Seaton
6ea7a15e6f
Updating Security String to 2017-01-05 am: 26250019df am: 6a9981128d am: 1691e69497 -s ours am: 4d3fa3f47e am: 26f54a9c9d am: 1685901f54 am: de90bd9c11 am: 373d596d29 am: d4318b4dd8 am: 6b712cfc00
...
am: f374f992fa
2016-11-17 19:58:25 +00:00
Adam Seaton
e6fc275aff
Updating Security String to 2017-01-01 am: a0985a838b am: 542e90b0be am: 99abf297d8 -s ours am: 8316b162d9 am: 3d6c04a185 am: 954e945541 am: 00e57d1e7d am: 69324d3272 am: aca891ceb7 am: c7c9e9e6ae
...
am: da23655530
2016-11-17 19:58:20 +00:00
Adam Seaton
777b8bb190
Merge changes I30f397b0,I717a6f03 into lmp-dev am: 1a242b67fe am: 27ac4ac1da am: ac64c64f9a am: 618f64d183 am: d635edfd04 am: 6f0c3f4bdc am: c5ecbe4047 am: 4a45d769e9 am: e033ae9cff
...
am: 8185ca3cd3
2016-11-17 19:50:33 +00:00
Adam Seaton
f374f992fa
Updating Security String to 2017-01-05 am: 26250019df am: 6a9981128d am: 1691e69497 -s ours am: 4d3fa3f47e am: 26f54a9c9d am: 1685901f54 am: de90bd9c11 am: 373d596d29 am: d4318b4dd8
...
am: 6b712cfc00
2016-11-17 19:50:28 +00:00
Adam Seaton
da23655530
Updating Security String to 2017-01-01 am: a0985a838b am: 542e90b0be am: 99abf297d8 -s ours am: 8316b162d9 am: 3d6c04a185 am: 954e945541 am: 00e57d1e7d am: 69324d3272 am: aca891ceb7
...
am: c7c9e9e6ae
2016-11-17 19:50:22 +00:00
Adam Seaton
8185ca3cd3
Merge changes I30f397b0,I717a6f03 into lmp-dev am: 1a242b67fe am: 27ac4ac1da am: ac64c64f9a am: 618f64d183 am: d635edfd04 am: 6f0c3f4bdc am: c5ecbe4047 am: 4a45d769e9
...
am: e033ae9cff
2016-11-17 19:42:32 +00:00
Adam Seaton
6b712cfc00
Updating Security String to 2017-01-05 am: 26250019df am: 6a9981128d am: 1691e69497 -s ours am: 4d3fa3f47e am: 26f54a9c9d am: 1685901f54 am: de90bd9c11 am: 373d596d29
...
am: d4318b4dd8
2016-11-17 19:42:25 +00:00
Adam Seaton
c7c9e9e6ae
Updating Security String to 2017-01-01 am: a0985a838b am: 542e90b0be am: 99abf297d8 -s ours am: 8316b162d9 am: 3d6c04a185 am: 954e945541 am: 00e57d1e7d am: 69324d3272
...
am: aca891ceb7
2016-11-17 19:42:18 +00:00
Adam Seaton
e033ae9cff
Merge changes I30f397b0,I717a6f03 into lmp-dev am: 1a242b67fe am: 27ac4ac1da am: ac64c64f9a am: 618f64d183 am: d635edfd04 am: 6f0c3f4bdc am: c5ecbe4047
...
am: 4a45d769e9
2016-11-17 19:34:32 +00:00
Adam Seaton
d4318b4dd8
Updating Security String to 2017-01-05 am: 26250019df am: 6a9981128d am: 1691e69497 -s ours am: 4d3fa3f47e am: 26f54a9c9d am: 1685901f54 am: de90bd9c11
...
am: 373d596d29
2016-11-17 19:34:26 +00:00
Adam Seaton
aca891ceb7
Updating Security String to 2017-01-01 am: a0985a838b am: 542e90b0be am: 99abf297d8 -s ours am: 8316b162d9 am: 3d6c04a185 am: 954e945541 am: 00e57d1e7d
...
am: 69324d3272
2016-11-17 19:34:19 +00:00
Adam Seaton
4a45d769e9
Merge changes I30f397b0,I717a6f03 into lmp-dev am: 1a242b67fe am: 27ac4ac1da am: ac64c64f9a am: 618f64d183 am: d635edfd04 am: 6f0c3f4bdc
...
am: c5ecbe4047
2016-11-17 19:27:29 +00:00
Adam Seaton
373d596d29
Updating Security String to 2017-01-05 am: 26250019df am: 6a9981128d am: 1691e69497 -s ours am: 4d3fa3f47e am: 26f54a9c9d am: 1685901f54
...
am: de90bd9c11
2016-11-17 19:27:23 +00:00
Adam Seaton
69324d3272
Updating Security String to 2017-01-01 am: a0985a838b am: 542e90b0be am: 99abf297d8 -s ours am: 8316b162d9 am: 3d6c04a185 am: 954e945541
...
am: 00e57d1e7d
2016-11-17 19:27:17 +00:00
Adam Seaton
c5ecbe4047
Merge changes I30f397b0,I717a6f03 into lmp-dev am: 1a242b67fe am: 27ac4ac1da am: ac64c64f9a am: 618f64d183 am: d635edfd04
...
am: 6f0c3f4bdc
2016-11-17 19:19:58 +00:00
Adam Seaton
de90bd9c11
Updating Security String to 2017-01-05 am: 26250019df am: 6a9981128d am: 1691e69497 -s ours am: 4d3fa3f47e am: 26f54a9c9d
...
am: 1685901f54
2016-11-17 19:19:51 +00:00
Adam Seaton
00e57d1e7d
Updating Security String to 2017-01-01 am: a0985a838b am: 542e90b0be am: 99abf297d8 -s ours am: 8316b162d9 am: 3d6c04a185
...
am: 954e945541
2016-11-17 19:19:46 +00:00
Adam Seaton
6f0c3f4bdc
Merge changes I30f397b0,I717a6f03 into lmp-dev am: 1a242b67fe am: 27ac4ac1da am: ac64c64f9a am: 618f64d183
...
am: d635edfd04
2016-11-17 19:12:27 +00:00
Adam Seaton
1685901f54
Updating Security String to 2017-01-05 am: 26250019df am: 6a9981128d am: 1691e69497 -s ours am: 4d3fa3f47e
...
am: 26f54a9c9d
2016-11-17 19:12:23 +00:00
Adam Seaton
954e945541
Updating Security String to 2017-01-01 am: a0985a838b am: 542e90b0be am: 99abf297d8 -s ours am: 8316b162d9
...
am: 3d6c04a185
2016-11-17 19:12:18 +00:00
Adam Seaton
d635edfd04
Merge changes I30f397b0,I717a6f03 into lmp-dev am: 1a242b67fe am: 27ac4ac1da am: ac64c64f9a
...
am: 618f64d183
2016-11-17 19:05:27 +00:00
Adam Seaton
26f54a9c9d
Updating Security String to 2017-01-05 am: 26250019df am: 6a9981128d am: 1691e69497 -s ours
...
am: 4d3fa3f47e
2016-11-17 19:05:21 +00:00
Adam Seaton
3d6c04a185
Updating Security String to 2017-01-01 am: a0985a838b am: 542e90b0be am: 99abf297d8 -s ours
...
am: 8316b162d9
2016-11-17 19:05:16 +00:00
Adam Seaton
618f64d183
Merge changes I30f397b0,I717a6f03 into lmp-dev am: 1a242b67fe am: 27ac4ac1da
...
am: ac64c64f9a
2016-11-17 18:57:26 +00:00
Adam Seaton
4d3fa3f47e
Updating Security String to 2017-01-05 am: 26250019df am: 6a9981128d
...
am: 1691e69497
2016-11-17 18:57:21 +00:00
