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
6f45a5f721
Merge "DO NOT MERGE increase generic_mips system partition" into lmp-dev am: 198262ff83 -s ours am: 953a9eb3d3 am: 14d24b3d5f -s ours
...
am: 0d45d96082
2016-12-02 16:17:49 +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
0d45d96082
Merge "DO NOT MERGE increase generic_mips system partition" into lmp-dev am: 198262ff83 -s ours am: 953a9eb3d3
...
am: 14d24b3d5f
2016-12-02 16:10:18 +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
14d24b3d5f
Merge "DO NOT MERGE increase generic_mips system partition" into lmp-dev am: 198262ff83 -s ours
...
am: 953a9eb3d3
2016-12-02 16:03:16 +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
953a9eb3d3
Merge "DO NOT MERGE increase generic_mips system partition" into lmp-dev
...
am: 198262ff83
2016-12-02 15:55:31 +00:00
Marco Nelissen
0c041e9ada
DO NOT MERGE increase generic_mips system partition
...
am: 7824073a36
2016-12-02 15:55:30 +00:00
Marco Nelissen
198262ff83
Merge "DO NOT MERGE increase generic_mips system partition" into lmp-dev
2016-12-02 15:45:17 +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
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
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
Adam Seaton
8316b162d9
Updating Security String to 2017-01-01 am: a0985a838b am: 542e90b0be
...
am: 99abf297d8
2016-11-17 18:57:16 +00:00
Adam Seaton
ac64c64f9a
Merge changes I30f397b0,I717a6f03 into lmp-dev am: 1a242b67fe
...
am: 27ac4ac1da
2016-11-17 18:18:50 +00:00
Adam Seaton
1691e69497
Updating Security String to 2017-01-05 am: 26250019df
...
am: 6a9981128d
2016-11-17 18:18:45 +00:00
Adam Seaton
99abf297d8
Updating Security String to 2017-01-01 am: a0985a838b
...
am: 542e90b0be
2016-11-17 18:18:41 +00:00
Adam Seaton
27ac4ac1da
Merge changes I30f397b0,I717a6f03 into lmp-dev
...
am: 1a242b67fe
2016-11-17 18:10:46 +00:00
Adam Seaton
6a9981128d
Updating Security String to 2017-01-05
...
am: 26250019df
2016-11-17 18:10:45 +00:00
Adam Seaton
542e90b0be
Updating Security String to 2017-01-01
...
am: a0985a838b
2016-11-17 18:10:41 +00:00
Adam Seaton
1a242b67fe
Merge changes I30f397b0,I717a6f03 into lmp-dev
...
* changes:
Updating Security String to 2017-01-05
Updating Security String to 2017-01-01
2016-11-17 18:04:33 +00:00
Adam Seaton
26cd57c3dd
Update Security String to 2017-01-05 in klp-dev am: 4f483f18e7 am: b2cc64fdd5 am: 3fa1b8a55e -s ours am: 7fa6402d8e am: 70849c073b am: 85e8b1c54f am: a0e047834c am: e515169acc am: 925cdbcc44 am: 3b6d4247d4 am: fc9a3a6289
...
am: e6228c3c29
2016-11-17 00:56:52 +00:00
Adam Seaton
c9372a0cf7
Update Security string to 2017-01-01 in klp-dev am: 21f5d281f3 am: 0f344dd00a am: a50e96923c -s ours am: 6a89a1936f am: 2652d28bea am: a8cedadbf9 am: f1372e43e5 am: 27202c78b9 am: 0ab37afc51 am: 23654fcee6 am: 49ab1b9aec
...
am: 4066fd01b1
2016-11-17 00:56:41 +00:00
Adam Seaton
e6228c3c29
Update Security String to 2017-01-05 in klp-dev am: 4f483f18e7 am: b2cc64fdd5 am: 3fa1b8a55e -s ours am: 7fa6402d8e am: 70849c073b am: 85e8b1c54f am: a0e047834c am: e515169acc am: 925cdbcc44 am: 3b6d4247d4
...
am: fc9a3a6289
2016-11-17 00:50:16 +00:00
Adam Seaton
4066fd01b1
Update Security string to 2017-01-01 in klp-dev am: 21f5d281f3 am: 0f344dd00a am: a50e96923c -s ours am: 6a89a1936f am: 2652d28bea am: a8cedadbf9 am: f1372e43e5 am: 27202c78b9 am: 0ab37afc51 am: 23654fcee6
...
am: 49ab1b9aec
2016-11-17 00:50:09 +00:00
Adam Seaton
fc9a3a6289
Update Security String to 2017-01-05 in klp-dev am: 4f483f18e7 am: b2cc64fdd5 am: 3fa1b8a55e -s ours am: 7fa6402d8e am: 70849c073b am: 85e8b1c54f am: a0e047834c am: e515169acc am: 925cdbcc44
...
am: 3b6d4247d4
2016-11-17 00:43:14 +00:00
Adam Seaton
49ab1b9aec
Update Security string to 2017-01-01 in klp-dev am: 21f5d281f3 am: 0f344dd00a am: a50e96923c -s ours am: 6a89a1936f am: 2652d28bea am: a8cedadbf9 am: f1372e43e5 am: 27202c78b9 am: 0ab37afc51
...
am: 23654fcee6
2016-11-17 00:43:08 +00:00
Adam Seaton
3b6d4247d4
Update Security String to 2017-01-05 in klp-dev am: 4f483f18e7 am: b2cc64fdd5 am: 3fa1b8a55e -s ours am: 7fa6402d8e am: 70849c073b am: 85e8b1c54f am: a0e047834c am: e515169acc
...
am: 925cdbcc44
2016-11-17 00:36:15 +00:00
