Merge "Only call make_recovery_patch when BUILDING_SYSTEM_IMAGE." am: b455273444

am: 7100e93233

Change-Id: I1c925936c6d5992bd9544e87ab59836f46090ebb
This commit is contained in:
Daniel Norman
2019-03-25 16:29:24 -07:00
committed by android-build-merger

View File

@@ -4016,8 +4016,10 @@ ifdef BOARD_BPT_DISK_SIZE
endif endif
$(call generate-userimage-prop-dictionary, $(zip_root)/META/misc_info.txt) $(call generate-userimage-prop-dictionary, $(zip_root)/META/misc_info.txt)
ifneq ($(INSTALLED_RECOVERYIMAGE_TARGET),) ifneq ($(INSTALLED_RECOVERYIMAGE_TARGET),)
ifdef BUILDING_SYSTEM_IMAGE
$(hide) PATH=$(foreach p,$(INTERNAL_USERIMAGES_BINARY_PATHS),$(p):)$$PATH MKBOOTIMG=$(MKBOOTIMG) \ $(hide) PATH=$(foreach p,$(INTERNAL_USERIMAGES_BINARY_PATHS),$(p):)$$PATH MKBOOTIMG=$(MKBOOTIMG) \
build/make/tools/releasetools/make_recovery_patch $(zip_root) $(zip_root) build/make/tools/releasetools/make_recovery_patch $(zip_root) $(zip_root)
endif # BUILDING_SYSTEM_IMAGE
endif endif
ifeq ($(AB_OTA_UPDATER),true) ifeq ($(AB_OTA_UPDATER),true)
@# When using the A/B updater, include the updater config files in the zip. @# When using the A/B updater, include the updater config files in the zip.