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

Commit 8e0ac248 authored by dhacker29's avatar dhacker29
Browse files

build: Actually build the recovery.img if !BOARD_CUSTOM_BOOTIMG_MK 

Fix the BOARD_CUSTOM_BOOTIMG_MK if and call build of recovery.img
also removed unused variable RECOVERYIMAGE_EXTRA_DEPS until associated
commit is merged

Change-Id: I94f5f26bc01e03d761ccc260342f330a4a06b141
parent b1e40014

core/Makefile

+4 −4
Original line number Diff line number Diff line
@@ -960,7 +960,7 @@ define build-recoveryimage-target 
          > $(TARGET_RECOVERY_ROOT_OUT)/default.prop

  $(hide) $(MKBOOTFS) -d $(TARGET_OUT) $(TARGET_RECOVERY_ROOT_OUT) | $(MINIGZIP) > $(recovery_ramdisk)



  $(if $(filter $(BOARD_CUSTOM_BOOTIMG_MK),),

  $(if !$(BOARD_CUSTOM_BOOTIMG_MK),

    $(if $(filter true,$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SUPPORTS_VBOOT)), \

      $(hide) $(MKBOOTIMG) $(INTERNAL_RECOVERYIMAGE_ARGS) $(BOARD_MKBOOTIMG_ARGS) --output $(1).unsigned, \

      $(hide) $(MKBOOTIMG) $(INTERNAL_RECOVERYIMAGE_ARGS) $(BOARD_MKBOOTIMG_ARGS) --output $(1) --id > $(RECOVERYIMAGE_ID_FILE))
@@ -976,7 +976,7 @@ $(recovery_uncompressed_ramdisk): $(MINIGZIP) $(recovery_ramdisk) 
	@echo -e ${CL_CYN}"----- Making uncompressed recovery ramdisk ------"${CL_RST}

	$(MKBOOTFS) $(TARGET_RECOVERY_ROOT_OUT) > $@



$(recovery_ramdisk): $(MKBOOTFS) $(MKBOOTIMG) $(MINIGZIP) $(RECOVERYIMAGE_EXTRA_DEPS) \

$(recovery_ramdisk): $(MKBOOTFS) $(MINIGZIP) \

		$(INSTALLED_RAMDISK_TARGET) \

		$(INSTALLED_BOOTIMAGE_TARGET) \

		$(INTERNAL_RECOVERYIMAGE_FILES) \
@@ -985,10 +985,10 @@ $(recovery_ramdisk): $(MKBOOTFS) $(MKBOOTIMG) $(MINIGZIP) $(RECOVERYIMAGE_EXTRA_ 
		$(recovery_build_prop) $(recovery_resource_deps) $(recovery_root_deps) \

		$(recovery_fstab) \

		$(RECOVERY_INSTALL_OTA_KEYS)

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



ifndef BOARD_CUSTOM_BOOTIMG_MK

$(INSTALLED_RECOVERYIMAGE_TARGET): $(recovery_ramdisk) $(recovery_kernel)

$(INSTALLED_RECOVERYIMAGE_TARGET): $(MKBOOTIMG) $(recovery_ramdisk) $(recovery_kernel)

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

endif # BOARD_CUSTOM_BOOTIMG_MK



$(RECOVERY_RESOURCE_ZIP): $(INSTALLED_RECOVERYIMAGE_TARGET)