commit 5b391db393138c6689edd365b2917253f5d816e8
author android-build-team Robot <android-build-team-robot@google.com> Fri Sep 15 23:59:23 2017 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Sat Sep 16 00:00:01 2017 +0000
tree 700731ff54eb1717f5c3411e4b8ee964c678f9ae
parent 27ada321a4e4601e1a0e4b0f4567a6cbd81badf9
parent 2acdef8fc3f1ad72402dd683cc017d058280250c

Make change and version bump to OPD3.170816.010

Change-Id: I71def3962beae6f9b316d059c1da81bd90c7e741

core/build_id.mk

diff --git a/core/build_id.mk b/core/build_id.mk
index bb19591..7f9471a 100644
--- a/core/build_id.mk
+++ b/core/build_id.mk
@@ -18,4 +18,4 @@
 # (like "CRB01").  It must be a single word, and is
 # capitalized by convention.
 
-export BUILD_ID=OPD3.170816.009
+export BUILD_ID=OPD3.170816.010

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 cf78d5e..a203fe0 100755
--- a/tools/releasetools/add_img_to_target_files.py
+++ b/tools/releasetools/add_img_to_target_files.py
@@ -502,7 +502,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"))