From c0f413f0ad567ef55417dd366e26e800553a472c Mon Sep 17 00:00:00 2001 From: Bill Peckham Date: Thu, 7 Nov 2019 11:27:02 -0800 Subject: [PATCH] Don't generate recovery patch for A/B systems. An A/B system that has a recovery image should not generate the recovery patch. This change gates the creation of the recovery patch such that we create it only when the recovery image exists and only for non-A/B systems. Test: Build A/B system, verify that recovery patch is not present. Bug: 144104493 Change-Id: Ib570c21b73912c4e4b7a964b192abc15fde9a753 --- core/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/core/Makefile b/core/Makefile index 2879ab0a83..ea852e630c 100644 --- a/core/Makefile +++ b/core/Makefile @@ -4348,10 +4348,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