Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dcfe8aa7 authored by Michael Schwartz's avatar Michael Schwartz Committed by android-build-merger
Browse files

Merge "Include vbmeta.img into <product>-img.zip" into oc-mr1-dev 

am: c5027d6e

Change-Id: Ie8ec82820946766aea85a43757f0507a42ea0ef9
parents cb373600 c5027d6e

core/Makefile

+9 −0
Original line number Diff line number Diff line
@@ -2275,6 +2275,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) \
@@ -2495,6 +2496,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/