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

Commit 458af2da authored by Dan Willemsen's avatar Dan Willemsen
Browse files

Fix dependencies on INSTALLED_RECOVERYIMAGE_TARGET 

Instead of copying the logic (which led to divergences), use the
same list of dependencies for both users of build-recoveryimage-target

Bug: 158774198
Test: treehugger
Test: build-coral.ninja is the same before/after
Change-Id: I8f8c006432f3b8120df1f39c98009155fdff32ad
Merged-In: I8f8c006432f3b8120df1f39c98009155fdff32ad
(cherry picked from commit d120ac68)
parent 0ffb2a82

core/Makefile

+14 −29
Original line number Diff line number Diff line
@@ -2235,52 +2235,37 @@ define build-recoveryimage-target 
      $(AVBTOOL) add_hash_footer --image $(1) --partition_size $(BOARD_RECOVERYIMAGE_PARTITION_SIZE) --partition_name recovery $(INTERNAL_AVB_RECOVERY_SIGNING_ARGS) $(BOARD_AVB_RECOVERY_ADD_HASH_FOOTER_ARGS)))

endef



ifeq ($(BOARD_USES_RECOVERY_AS_BOOT),true)

recoveryimage-deps := $(MKBOOTIMG) $(recovery_ramdisk) $(recovery_kernel)

ifeq (true,$(PRODUCT_SUPPORTS_BOOT_SIGNER))

$(INSTALLED_BOOTIMAGE_TARGET) : $(BOOT_SIGNER)

  recoveryimage-deps += $(BOOT_SIGNER)

endif

ifeq (true,$(PRODUCT_SUPPORTS_VBOOT))

$(INSTALLED_BOOTIMAGE_TARGET) : $(VBOOT_SIGNER)

  recoveryimage-deps += $(VBOOT_SIGNER)

endif

ifeq (true,$(BOARD_AVB_ENABLE))

$(INSTALLED_BOOTIMAGE_TARGET) : $(AVBTOOL) $(BOARD_AVB_BOOT_KEY_PATH)

  recoveryimage-deps += $(AVBTOOL) $(BOARD_AVB_BOOT_KEY_PATH)

endif

ifdef BOARD_INCLUDE_RECOVERY_DTBO

  ifdef BOARD_PREBUILT_RECOVERY_DTBOIMAGE

$(INSTALLED_BOOTIMAGE_TARGET): $(BOARD_PREBUILT_RECOVERY_DTBOIMAGE)

    recoveryimage-deps += $(BOARD_PREBUILT_RECOVERY_DTBOIMAGE)

  else

$(INSTALLED_BOOTIMAGE_TARGET): $(BOARD_PREBUILT_DTBOIMAGE)

    recoveryimage-deps += $(BOARD_PREBUILT_DTBOIMAGE)

  endif

endif

ifdef BOARD_INCLUDE_RECOVERY_ACPIO

$(INSTALLED_BOOTIMAGE_TARGET): $(BOARD_RECOVERY_ACPIO)

  recoveryimage-deps += $(BOARD_RECOVERY_ACPIO)

endif

ifdef BOARD_INCLUDE_DTB_IN_BOOTIMG

$(INSTALLED_BOOTIMAGE_TARGET): $(INSTALLED_DTBIMAGE_TARGET)

  recoveryimage-deps += $(INSTALLED_DTBIMAGE_TARGET)

endif



$(INSTALLED_BOOTIMAGE_TARGET): $(MKBOOTIMG) $(recovery_ramdisk) \

	    $(recovery_kernel)

ifeq ($(BOARD_USES_RECOVERY_AS_BOOT),true)

$(INSTALLED_BOOTIMAGE_TARGET): $(recoveryimage-deps)

	$(call pretty,"Target boot image from recovery: $@")

	$(call build-recoveryimage-target, $@, $(PRODUCT_OUT)/$(subst .img,,$(subst boot,kernel,$(notdir $@))))

endif # BOARD_USES_RECOVERY_AS_BOOT



ifdef BOARD_INCLUDE_RECOVERY_DTBO

ifdef BOARD_PREBUILT_RECOVERY_DTBOIMAGE

$(INSTALLED_RECOVERYIMAGE_TARGET): $(BOARD_PREBUILT_RECOVERY_DTBOIMAGE)

else

$(INSTALLED_RECOVERYIMAGE_TARGET): $(BOARD_PREBUILT_DTBOIMAGE)

endif

endif

ifdef BOARD_INCLUDE_RECOVERY_ACPIO

$(INSTALLED_RECOVERYIMAGE_TARGET): $(BOARD_RECOVERY_ACPIO)

endif

ifdef BOARD_INCLUDE_DTB_IN_BOOTIMG

$(INSTALLED_RECOVERYIMAGE_TARGET): $(INSTALLED_DTBIMAGE_TARGET)

endif



$(INSTALLED_RECOVERYIMAGE_TARGET): $(MKBOOTIMG) $(recovery_ramdisk) \

	    $(recovery_kernel)

$(INSTALLED_RECOVERYIMAGE_TARGET): $(recoveryimage-deps)

	$(call build-recoveryimage-target, $@, $(recovery_kernel))



ifdef RECOVERY_RESOURCE_ZIP