d42e97ebb4
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 |
||
|---|---|---|
| .. | ||
| acp | ||
| apicheck | ||
| atree | ||
| droiddoc | ||
| fs_config | ||
| fs_get_stats | ||
| ijar | ||
| libhost | ||
| makeparallel | ||
| releasetools | ||
| signapk | ||
| signtos | ||
| zipalign | ||
| ziptime | ||
| adbs | ||
| Android.mk | ||
| brillo-clang-format | ||
| buildinfo.sh | ||
| check_builds.sh | ||
| check_link_type.py | ||
| check_radio_versions.py | ||
| compare_fileslist.py | ||
| dump-package-stats | ||
| event_log_tags.py | ||
| fat16copy.py | ||
| fileslist.py | ||
| fileslist_util.py | ||
| filter-product-graph.py | ||
| findleaves.py | ||
| fixlinebreaks.sh | ||
| generate-notice-files.py | ||
| java-event-log-tags.py | ||
| java-layers.py | ||
| kati_all_products.sh | ||
| merge-event-log-tags.py | ||
| mktarball.sh | ||
| normalize_path.py | ||
| parsedeps.py | ||
| post_process_props.py | ||
| print_module_licenses.sh | ||
| product_debug.py | ||
| soong_to_convert.py | ||
| warn.py | ||