Merge "Add vbmeta image support for verified boot"

am: 8bc5c8521a

Change-Id: I7de333ee2b7502c0040c2f27f36c8059e188ec03
This commit is contained in:
Vineeta Srivastava 2017-04-03 20:23:15 +00:00 committed by android-build-merger
commit 5e3590e81e

View file

@ -115,6 +115,7 @@ static struct {
{"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 @@ std::string find_item(const char* item, const char* product) {
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")) {