Merge "Don't generate recovery patch for A/B systems." am: 43e5420a50
am: 0a17dc31f3
Change-Id: I4973706e9be0edb9e8e925b50fb8b637045e6734
This commit is contained in:
commit
036ae61e93
1 changed files with 2 additions and 0 deletions
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue