From 6bbb11a6205ef96cd5a90227a38c4c574431cf15 Mon Sep 17 00:00:00 2001 From: Bowgo Tsai Date: Fri, 1 Sep 2017 22:55:44 +0800 Subject: [PATCH] Include vbmeta.img into -img.zip Bug: 65227202 Test: make dist, checks vbmeta.img is included in -img.zip Change-Id: I3e09f036441bcf7e98d8f76360df1e17466ae38e --- core/Makefile | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/core/Makefile b/core/Makefile index 4a4760f5e..7f0e1cd2c 100644 --- a/core/Makefile +++ b/core/Makefile @@ -2271,6 +2271,7 @@ $(BUILT_TARGET_FILES_PACKAGE): \ $(INSTALLED_USERDATAIMAGE_TARGET) \ $(INSTALLED_CACHEIMAGE_TARGET) \ $(INSTALLED_VENDORIMAGE_TARGET) \ + $(INSTALLED_VBMETAIMAGE_TARGET) \ $(INSTALLED_DTBOIMAGE_TARGET) \ $(INTERNAL_SYSTEMOTHERIMAGE_FILES) \ $(INSTALLED_ANDROID_INFO_TXT_TARGET) \ @@ -2491,6 +2492,14 @@ ifeq ($(BREAKPAD_GENERATE_SYMBOLS),true) @# If breakpad symbols have been generated, add them to the zip. $(hide) $(ACP) -r $(TARGET_OUT_BREAKPAD) $(zip_root)/BREAKPAD endif +# BOARD_BUILD_DISABLED_VBMETAIMAGE is used to build a special vbmeta.img +# that disables AVB verification. The content is fixed and we can just copy +# it to $(zip_root)/IMAGES without passing some info into misc_info.txt for +# regeneration. +ifeq (true,$(BOARD_BUILD_DISABLED_VBMETAIMAGE)) + $(hide) mkdir -p $(zip_root)/IMAGES + $(hide) cp $(INSTALLED_VBMETAIMAGE_TARGET) $(zip_root)/IMAGES/ +endif ifdef BOARD_PREBUILT_VENDORIMAGE $(hide) mkdir -p $(zip_root)/IMAGES $(hide) cp $(INSTALLED_VENDORIMAGE_TARGET) $(zip_root)/IMAGES/