Colin Cross
c2e68615e7
Merge "Fix warning with AAPT2 and LOCAL_STATIC_ANDROID_LIBRARIES" am: 1498712a6b am: 51c1eeefb3
...
am: 04158fac7c
2016-12-02 22:18:27 +00:00
Colin Cross
04158fac7c
Merge "Fix warning with AAPT2 and LOCAL_STATIC_ANDROID_LIBRARIES" am: 1498712a6b
...
am: 51c1eeefb3
2016-12-02 22:09:27 +00:00
Colin Cross
51c1eeefb3
Merge "Fix warning with AAPT2 and LOCAL_STATIC_ANDROID_LIBRARIES"
...
am: 1498712a6b
2016-12-02 22:00:26 +00:00
Colin Cross
1498712a6b
Merge "Fix warning with AAPT2 and LOCAL_STATIC_ANDROID_LIBRARIES"
2016-12-02 21:47:58 +00:00
Android Build Merger (Role)
c0e492a42b
Merge "Merge "DO NOT MERGE increase generic_mips system partition" into lmp-dev am: 198262ff83 -s ours am: 953a9eb3d3 am: 14d24b3d5f -s ours am: 0d45d96082 am: 6f45a5f721 am: 22b2728055 am: 37d1ec0632 -s ours am: f8dc0c9dc5 am: c65b6de802 am: 56aa9f17ba am: 6127b67b64 am: 7ea34d3816" into nyc-mr2-dev-plus-aosp
2016-12-02 17:20:02 +00:00
Marco Nelissen
b2329c2075
Merge "DO NOT MERGE increase generic_mips system partition" into lmp-dev am: 198262ff83 -s ours am: 953a9eb3d3 am: 14d24b3d5f -s ours am: 0d45d96082 am: 6f45a5f721 am: 22b2728055 am: 37d1ec0632 -s ours am: f8dc0c9dc5 am: c65b6de802 am: 56aa9f17ba am: 6127b67b64
...
am: 7ea34d3816
2016-12-02 17:19:50 +00:00
Android Build Merger (Role)
82bc4ecd17
Merge "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 am: d787924736" into nyc-mr2-dev-plus-aosp
2016-12-02 17:19:44 +00:00
Marco Nelissen
5307ed732b
Merge "DO NOT MERGE increase generic_mips system partition" into lmp-dev am: 198262ff83 -s ours am: 953a9eb3d3 am: 14d24b3d5f -s ours am: 0d45d96082 am: 6f45a5f721 am: 22b2728055 am: 37d1ec0632 -s ours am: f8dc0c9dc5 am: c65b6de802 am: 56aa9f17ba am: 6127b67b64
...
am: edb09ade41
2016-12-02 17:15:54 +00:00
Marco Nelissen
4c783941b2
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
...
am: d787924736
2016-12-02 17:14:37 +00:00
Marco Nelissen
0b6827f452
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
...
am: 9b0f2de208
2016-12-02 17:14:36 +00:00
Marco Nelissen
edb09ade41
Merge "DO NOT MERGE increase generic_mips system partition" into lmp-dev am: 198262ff83 -s ours am: 953a9eb3d3 am: 14d24b3d5f -s ours am: 0d45d96082 am: 6f45a5f721 am: 22b2728055 am: 37d1ec0632 -s ours am: f8dc0c9dc5 am: c65b6de802 am: 56aa9f17ba
...
am: 6127b67b64
2016-12-02 17:07:23 +00:00
Marco Nelissen
7ea34d3816
Merge "DO NOT MERGE increase generic_mips system partition" into lmp-dev am: 198262ff83 -s ours am: 953a9eb3d3 am: 14d24b3d5f -s ours am: 0d45d96082 am: 6f45a5f721 am: 22b2728055 am: 37d1ec0632 -s ours am: f8dc0c9dc5 am: c65b6de802 am: 56aa9f17ba
...
am: 6127b67b64
2016-12-02 17:07:23 +00:00
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
9b0f2de208
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
6127b67b64
Merge "DO NOT MERGE increase generic_mips system partition" into lmp-dev am: 198262ff83 -s ours am: 953a9eb3d3 am: 14d24b3d5f -s ours am: 0d45d96082 am: 6f45a5f721 am: 22b2728055 am: 37d1ec0632 -s ours am: f8dc0c9dc5 am: c65b6de802
...
am: 56aa9f17ba
2016-12-02 17:00:23 +00:00
Android Build Merger (Role)
0607b67a44
Merge "Build recovery-two-step.img for two-step OTAs. am: 47ec5ab561 am: eb9de30596 am: 3014c885b2" into nyc-mr2-dev-plus-aosp
2016-12-02 17:00:15 +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
Tao Bao
e09b1fd78b
Build recovery-two-step.img for two-step OTAs. am: 47ec5ab561 am: eb9de30596
...
am: 3014c885b2
2016-12-02 17:00:05 +00:00
Tao Bao
cf5426161a
Build recovery-two-step.img for two-step OTAs. am: 47ec5ab561 am: eb9de30596
...
am: f38c5800ca
2016-12-02 17:00:04 +00:00
Marco Nelissen
56aa9f17ba
Merge "DO NOT MERGE increase generic_mips system partition" into lmp-dev am: 198262ff83 -s ours am: 953a9eb3d3 am: 14d24b3d5f -s ours am: 0d45d96082 am: 6f45a5f721 am: 22b2728055 am: 37d1ec0632 -s ours am: f8dc0c9dc5
...
am: c65b6de802
2016-12-02 16:53:19 +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
Tao Bao
f38c5800ca
Build recovery-two-step.img for two-step OTAs. am: 47ec5ab561
...
am: eb9de30596
2016-12-02 16:53:04 +00:00
Marco Nelissen
c65b6de802
Merge "DO NOT MERGE increase generic_mips system partition" into lmp-dev am: 198262ff83 -s ours am: 953a9eb3d3 am: 14d24b3d5f -s ours am: 0d45d96082 am: 6f45a5f721 am: 22b2728055 am: 37d1ec0632 -s ours
...
am: f8dc0c9dc5
2016-12-02 16:46:48 +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
f8dc0c9dc5
Merge "DO NOT MERGE increase generic_mips system partition" into lmp-dev am: 198262ff83 -s ours am: 953a9eb3d3 am: 14d24b3d5f -s ours am: 0d45d96082 am: 6f45a5f721 am: 22b2728055
...
am: 37d1ec0632
2016-12-02 16:39:47 +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
37d1ec0632
Merge "DO NOT MERGE increase generic_mips system partition" into lmp-dev am: 198262ff83 -s ours am: 953a9eb3d3 am: 14d24b3d5f -s ours am: 0d45d96082 am: 6f45a5f721
...
am: 22b2728055
2016-12-02 16:32:19 +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
22b2728055
Merge "DO NOT MERGE increase generic_mips system partition" into lmp-dev am: 198262ff83 -s ours am: 953a9eb3d3 am: 14d24b3d5f -s ours am: 0d45d96082
...
am: 6f45a5f721
2016-12-02 16:24:48 +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
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
8d290959b5
Merge "Build recovery-two-step.img for two-step OTAs." am: 06e14e438f am: d07f9995b8
...
am: c180a06b20
2016-12-02 15:33:31 +00:00
Tao Bao
c180a06b20
Merge "Build recovery-two-step.img for two-step OTAs." am: 06e14e438f
...
am: d07f9995b8
2016-12-02 15:26:29 +00:00
Tao Bao
d07f9995b8
Merge "Build recovery-two-step.img for two-step OTAs."
...
am: 06e14e438f
2016-12-02 15:19:00 +00:00
Tao Bao
06e14e438f
Merge "Build recovery-two-step.img for two-step OTAs."
2016-12-02 15:09:13 +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
Tao Bao
d42e97ebb4
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
2016-12-01 17:47:59 -08:00
Pirama Arumuga Nainar
bf762321f5
Merge "Do not *directly* package libbcc.so" am: ec0d7cbc49 am: 0cc559f7d8
...
am: 564a624870
2016-12-01 18:21:45 +00:00
Pirama Arumuga Nainar
564a624870
Merge "Do not *directly* package libbcc.so" am: ec0d7cbc49
...
am: 0cc559f7d8
2016-12-01 18:16:13 +00:00
Pirama Arumuga Nainar
0cc559f7d8
Merge "Do not *directly* package libbcc.so"
...
am: ec0d7cbc49
2016-12-01 18:11:13 +00:00
