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

Commit b0850bdb authored by Yifan Hong's avatar Yifan Hong Committed by Automerger Merge Worker
Browse files

Merge "Do not build recovery-resource.dat if move_recovery_res_to_vendor_boot"... 

Merge "Do not build recovery-resource.dat if move_recovery_res_to_vendor_boot" am: 9873891b am: 335c4b09

Original change: https://android-review.googlesource.com/c/platform/build/+/1467994

Change-Id: Ie7d081d08dd84c58e9a9f4f2864bac41beb5d97f
parents 7cf30602 335c4b09

core/Makefile

+5 −1
Original line number Original line Diff line number Diff line
@@ -1825,9 +1825,13 @@ endif 
#   e) We include the recovery ACPIO image within recovery - not needing the resource file as we

#   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

#      do bsdiff because boot and recovery will contain different number of entries

#      (BOARD_INCLUDE_RECOVERY_ACPIO = true).

#      (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) \

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.

# Named '.dat' so we don't attempt to use imgdiff for patching it.

RECOVERY_RESOURCE_ZIP := $(TARGET_OUT_VENDOR)/etc/recovery-resource.dat

RECOVERY_RESOURCE_ZIP := $(TARGET_OUT_VENDOR)/etc/recovery-resource.dat

ALL_DEFAULT_INSTALLED_MODULES += $(RECOVERY_RESOURCE_ZIP)

ALL_DEFAULT_INSTALLED_MODULES += $(RECOVERY_RESOURCE_ZIP)