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

Commit ef7a971d authored by Yifan Hong's avatar Yifan Hong
Browse files

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
parent c75a3c54

core/Makefile

+5 −1
Original line number Diff line number Diff line
@@ -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)