From ef7a971ded1126b7a65927076a1e303639ad1e8c Mon Sep 17 00:00:00 2001 From: Yifan Hong Date: Tue, 20 Oct 2020 13:17:42 -0700 Subject: [PATCH] Do not build recovery-resource.dat if move_recovery_res_to_vendor_boot If recovery resources are moved to vendor_boot, it also means there's no recovery image to install. Don't build recovery-resource.dat in this case. Test: builds with cuttlefish with GKI Bug: 156098440 Change-Id: I86db08d2dede6af644afadac54ff8beb853f4933 --- core/Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/core/Makefile b/core/Makefile index 2bbf68821..02535c23c 100644 --- a/core/Makefile +++ b/core/Makefile @@ -1796,9 +1796,13 @@ endif # e) We include the recovery ACPIO image within recovery - not needing the resource file as we # do bsdiff because boot and recovery will contain different number of entries # (BOARD_INCLUDE_RECOVERY_ACPIO = true). +# f) We build a single image that contains vendor_boot and recovery both - no recovery image to +# install +# (BOARD_MOVE_RECOVERY_RESOURCES_TO_VENDOR_BOOT = true). ifeq (,$(filter true, $(BOARD_USES_FULL_RECOVERY_IMAGE) $(BOARD_USES_RECOVERY_AS_BOOT) \ - $(BOARD_BUILD_SYSTEM_ROOT_IMAGE) $(BOARD_INCLUDE_RECOVERY_DTBO) $(BOARD_INCLUDE_RECOVERY_ACPIO))) + $(BOARD_BUILD_SYSTEM_ROOT_IMAGE) $(BOARD_INCLUDE_RECOVERY_DTBO) $(BOARD_INCLUDE_RECOVERY_ACPIO) \ + $(BOARD_MOVE_RECOVERY_RESOURCES_TO_VENDOR_BOOT))) # Named '.dat' so we don't attempt to use imgdiff for patching it. RECOVERY_RESOURCE_ZIP := $(TARGET_OUT_VENDOR)/etc/recovery-resource.dat ALL_DEFAULT_INSTALLED_MODULES += $(RECOVERY_RESOURCE_ZIP)