commit 0b08b8dc14d4cdb921aac05f4767ebf3c56812ce
author Treehugger Robot <treehugger-gerrit@google.com> Mon Sep 27 15:51:27 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Sep 27 15:51:27 2021 +0000
tree 3cca8d9397b989d66339f13709535b6e8c1b4e1c
parent 315e32a904b670bca8cf0a12a7916c14bf0d44ef
parent aba5c9eacd54e9b0cf5fbeaa1157ca8ec1d00786

Merge "Fix aosp_x86_64-user build failure"

tools/releasetools/add_img_to_target_files.py

diff --git a/tools/releasetools/add_img_to_target_files.py b/tools/releasetools/add_img_to_target_files.py
index 01cc233..2a4b56b 100644
--- a/tools/releasetools/add_img_to_target_files.py
+++ b/tools/releasetools/add_img_to_target_files.py
@@ -712,8 +712,10 @@
   # 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"]