tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Fix aosp_x86_64-user build failure"

Browse source
This commit is contained in:
Treehugger Robot 2021-09-27 15:51:27 +00:00 committed by Gerrit Code Review
commit 0b08b8dc14
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
tools/releasetools/add_img_to_target_files.py
View file

@ -712,8 +712,10 @@ def AddVbmetaDigest(output_zip):
# Calculate the vbmeta digest and put the result in to META/ # Calculate the vbmeta digest and put the result in to META/
boot_images = OPTIONS.info_dict.get("boot_images") boot_images = OPTIONS.info_dict.get("boot_images")
# Disable the digest calculation if the target_file is used as a container # Disable the digest calculation if the target_file is used as a container
# for boot images. # for boot images. A boot container might contain boot-5.4.img, boot-5.10.img
boot_container = boot_images and len(boot_images.split()) >= 2 # etc., instead of just a boot.img and will fail in vbmeta digest calculation.
boot_container = boot_images and (
len(boot_images.split()) >= 2 or boot_images.split()[0] != 'boot.img')
if (OPTIONS.info_dict.get("avb_enable") == "true" and not boot_container and if (OPTIONS.info_dict.get("avb_enable") == "true" and not boot_container and
OPTIONS.info_dict.get("avb_building_vbmeta_image") == "true"): OPTIONS.info_dict.get("avb_building_vbmeta_image") == "true"):
avbtool = OPTIONS.info_dict["avb_avbtool"] avbtool = OPTIONS.info_dict["avb_avbtool"]