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

Merge "Fix aosp_x86_64-user build failure" am: 0b08b8dc14 am: 38a6187cb2

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

Change-Id: Ie919d2ea394187848b169ddf8dd70cbc2123a421
This commit is contained in:
Treehugger Robot
2021-09-27 16:26:33 +00:00
committed by Automerger Merge Worker
parent 0c81c45963 38a6187cb2
commit acf14dbaba
1 changed files with 4 additions and 2 deletions
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/
boot_images = OPTIONS.info_dict.get("boot_images")
# Disable the digest calculation if the target_file is used as a container
# for boot images.
boot_container = boot_images and len(boot_images.split()) >= 2
# for boot images. A boot container might contain boot-5.4.img, boot-5.10.img
# 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
OPTIONS.info_dict.get("avb_building_vbmeta_image") == "true"):
avbtool = OPTIONS.info_dict["avb_avbtool"]