commit 825f3d03f49e17dad5c53306bd4f2ddc6075c0f9
author Vineeta Srivastava <vsrivastava@google.com> Mon Apr 03 20:34:37 2017 +0000
committer android-build-merger <android-build-merger@google.com> Mon Apr 03 20:34:37 2017 +0000
tree 461f2116c3505f11d9c149fec35918164af23cb9
parent 97d541ddb1678313d7117c435db1c7ed6227b06f
parent c0d0ce02a398a065ccb2e3d951bf2e513f4dfa00

Merge "Add vbmeta image support for verified boot" am: 8bc5c8521a am: 5e3590e81e am: 0bba8acf3f
am: 13bd93b77d

Change-Id: I3f6c194934350ab32d540f89578a092468a8b728

fastboot/fastboot.cpp

diff --git a/fastboot/fastboot.cpp b/fastboot/fastboot.cpp
index 2927b16..7dfb445 100644
--- a/fastboot/fastboot.cpp
+++ b/fastboot/fastboot.cpp
@@ -115,6 +115,7 @@
     {"system_other.img", "system.sig", "system", true, true},
     {"vendor.img", "vendor.sig", "vendor", true, false},
     {"vendor_other.img", "vendor.sig", "vendor", true, true},
+    {"vbmeta.img", "vbmeta.sig", "vbmeta", true, false},
 };
 
 static std::string find_item_given_name(const char* img_name, const char* product) {
@@ -144,6 +145,8 @@
         fn = "system.img";
     } else if(!strcmp(item,"vendor")) {
         fn = "vendor.img";
+    } else if(!strcmp(item,"vbmeta")) {
+        fn = "vbmeta.img";
     } else if(!strcmp(item,"userdata")) {
         fn = "userdata.img";
     } else if(!strcmp(item,"cache")) {