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

Commit 30248c6f authored by Tao Bao's avatar Tao Bao Committed by android-build-merger
Browse files

Merge "Remove the workaround that forces rebuilding recovery patch." am: 3d33aa7c am: 003ae1cd 

am: 2d5a1206

Change-Id: I90324abb7111a76542cdb1ccfa7b65e6826450e7
parents 86376d8f 2d5a1206

core/Makefile

+2 −3
Original line number Diff line number Diff line
@@ -4433,9 +4433,8 @@ endif # BOARD_SUPER_PARTITION_GROUPS 
ifeq ($(PRODUCT_VIRTUAL_AB_OTA),true)

	echo "virtual_ab=true" >> $(zip_root)/META/dynamic_partitions_info.txt

endif # PRODUCT_VIRTUAL_AB_OTA

	@# TODO(b/134525174): Remove `-r` after addressing the issue with recovery patch generation.

	$(hide) PATH=$(INTERNAL_USERIMAGES_BINARY_PATHS):$$PATH MKBOOTIMG=$(MKBOOTIMG) \

	    $(ADD_IMG_TO_TARGET_FILES) -a -r -v -p $(HOST_OUT) $(zip_root)

	PATH=$(INTERNAL_USERIMAGES_BINARY_PATHS):$$PATH MKBOOTIMG=$(MKBOOTIMG) \

	    $(ADD_IMG_TO_TARGET_FILES) -a -v -p $(HOST_OUT) $(zip_root)

ifeq ($(BUILD_QEMU_IMAGES),true)

	$(hide) AVBTOOL=$(AVBTOOL) $(MK_VBMETA_BOOT_KERNEL_CMDLINE_SH) $(zip_root)/IMAGES/vbmeta.img \

	    $(zip_root)/IMAGES/system.img $(zip_root)/IMAGES/VerifiedBootParams.textproto