commit 8a7b0dee6b00a1c8c3a391a2b7ae4ac25b3cb620
author Tao Bao <tbao@google.com> Wed Sep 13 22:10:43 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Sep 13 22:10:43 2017 +0000
tree d23cf07d93c9fdfb045d9907d5361a2e51139a26
parent b4a3124822c11efd9a0ff1cfef20a5ac8da3e898
parent b22afea0f0ea3880f9386a837850b13bcffc295c

Merge "Consider prebuilt vendor.img as having vendor partition."

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 1ce22e7..52d3918 100755
--- a/tools/releasetools/add_img_to_target_files.py
+++ b/tools/releasetools/add_img_to_target_files.py
@@ -505,7 +505,13 @@
       print("target_files appears to already contain images.")
       sys.exit(1)
 
-  has_vendor = os.path.isdir(os.path.join(OPTIONS.input_tmp, "VENDOR"))
+  # vendor.img is unlike system.img or system_other.img. Because it could be
+  # built from source, or dropped into target_files.zip as a prebuilt blob. We
+  # consider either of them as vendor.img being available, which could be used
+  # when generating vbmeta.img for AVB.
+  has_vendor = (os.path.isdir(os.path.join(OPTIONS.input_tmp, "VENDOR")) or
+                os.path.exists(os.path.join(OPTIONS.input_tmp, "IMAGES",
+                                            "vendor.img")))
   has_system_other = os.path.isdir(os.path.join(OPTIONS.input_tmp,
                                                 "SYSTEM_OTHER"))