StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Rename the boot image for avb validation" into rvc-dev am: d7dabee7fe am: 9bac3d1c94

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12005766

Change-Id: I64bafe12254987e8c8f943c95d936d15a8236974
This commit is contained in:
SzuWei Lin
2020-06-26 17:08:28 +00:00
committed by Automerger Merge Worker
parent 5d436e20d5 9bac3d1c94
commit bbb2e03727
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
tools/releasetools/validate_target_files.py
View File

@@ -371,6 +371,17 @@ def ValidateVerifiedBootImages(input_tmp, info_dict, options):
partition, info_dict, key_file) partition, info_dict, key_file)
cmd.extend(['--expected_chain_partition', chained_partition_arg]) cmd.extend(['--expected_chain_partition', chained_partition_arg])
# Handle the boot image with a non-default name, e.g. boot-5.4.img
boot_images = info_dict.get("boot_images")
if boot_images:
# we used the 1st boot image to generate the vbmeta. Rename the filename
# to boot.img so that avbtool can find it correctly.
first_image_name = boot_images.split()[0]
first_image_path = os.path.join(input_tmp, 'IMAGES', first_image_name)
assert os.path.isfile(first_image_path)
renamed_boot_image_path = os.path.join(input_tmp, 'IMAGES', 'boot.img')
os.rename(first_image_path, renamed_boot_image_path)
proc = common.Run(cmd) proc = common.Run(cmd)
stdoutdata, _ = proc.communicate() stdoutdata, _ = proc.communicate()
assert proc.returncode == 0, \ assert proc.returncode == 0, \