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

Commit 0a17dc31 authored by Bill Peckham's avatar Bill Peckham Committed by android-build-merger
Browse files

Merge "Don't generate recovery patch for A/B systems." 

am: 43e5420a

Change-Id: Iabcccc6dbf0f511150762df526facc0cf7ba1e1a
parents 7ad9383a 43e5420a

core/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -4354,10 +4354,12 @@ ifneq ($(PRODUCT_ODM_BASE_FS_PATH),) 
	$(hide) cp $(PRODUCT_ODM_BASE_FS_PATH) \

	  $(zip_root)/META/$(notdir $(PRODUCT_ODM_BASE_FS_PATH))

endif

ifneq ($(AB_OTA_UPDATER),true)

ifneq ($(INSTALLED_RECOVERYIMAGE_TARGET),)

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

	    $(MAKE_RECOVERY_PATCH) $(zip_root) $(zip_root)

endif

endif

ifeq ($(AB_OTA_UPDATER),true)

	@# When using the A/B updater, include the updater config files in the zip.

	$(hide) cp $(TOPDIR)system/update_engine/update_engine.conf $(zip_root)/META/update_engine_config.txt