commit a94f4d620928deaec2ac57bb0e84a53640ab15c7
author David Anderson <dvander@google.com> Tue Sep 18 14:30:35 2018 -0700
committer android-build-merger <android-build-merger@google.com> Tue Sep 18 14:30:35 2018 -0700
tree 74e91cfb822154fdb4131748f3ed46671ee2886f
parent 32e219b7f26fcc07593a4535071bd30188207e94
parent 55d76c70ff4e2d5342b036ce41e3a971e2065388

Merge "fastboot: Add vbmeta_mainline to the partition list." am: d800caf345 am: 0f863e101a
am: f2d0524fbe

Change-Id: I4dccc766c6f7954624a86ff00bb7f5be3c70dd7a

fastboot/fastboot.cpp

diff --git a/fastboot/fastboot.cpp b/fastboot/fastboot.cpp
index 817afd0..8e6c125 100644
--- a/fastboot/fastboot.cpp
+++ b/fastboot/fastboot.cpp
@@ -148,6 +148,11 @@
     { nullptr,    "system_other.img", "system.sig",   "system",   true,  ImageType::Normal },
     { "userdata", "userdata.img",     "userdata.sig", "userdata", true,  ImageType::Extra },
     { "vbmeta",   "vbmeta.img",       "vbmeta.sig",   "vbmeta",   true,  ImageType::BootCritical },
+    { "vbmeta_mainline",
+                  "vbmeta_mainline.img",
+                                      "vbmeta_mainline.sig",
+                                                      "vbmeta_mainline",
+                                                                  true,  ImageType::BootCritical },
     { "vendor",   "vendor.img",       "vendor.sig",   "vendor",   true,  ImageType::Normal },
     { nullptr,    "vendor_other.img", "vendor.sig",   "vendor",   true,  ImageType::Normal },
         // clang-format on