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

Commit da9f2d8f authored by Tao Bao's avatar Tao Bao Committed by Gerrit Code Review
Browse files

Merge changes Icf44032f,Iec8524d3 

* changes:
  Add the missing dependency on BOARD_PREBUILT_DTBOIMAGE.
  use BOARD_PREBUILT_DTBOIMAGE in target-files-package
parents 10f1a69a f4866c72

core/Makefile

+13 −4
Original line number Diff line number Diff line
@@ -1662,6 +1662,10 @@ endif 
ifeq (true,$(BOARD_AVB_ENABLE))

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

endif

ifdef BOARD_INCLUDE_RECOVERY_DTBO

$(INSTALLED_BOOTIMAGE_TARGET): $(BOARD_PREBUILT_DTBOIMAGE)

endif



$(INSTALLED_BOOTIMAGE_TARGET): $(MKBOOTFS) $(MKBOOTIMG) $(MINIGZIP) \

		$(INSTALLED_RAMDISK_TARGET) \

		$(INTERNAL_RECOVERYIMAGE_FILES) \
@@ -1675,6 +1679,10 @@ $(INSTALLED_BOOTIMAGE_TARGET): $(MKBOOTFS) $(MKBOOTIMG) $(MINIGZIP) \ 
		$(DEPMOD)

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

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

endif # BOARD_USES_RECOVERY_AS_BOOT



ifdef BOARD_INCLUDE_RECOVERY_DTBO

$(INSTALLED_RECOVERYIMAGE_TARGET): $(BOARD_PREBUILT_DTBOIMAGE)

endif



$(INSTALLED_RECOVERYIMAGE_TARGET): $(MKBOOTFS) $(MKBOOTIMG) $(MINIGZIP) \
@@ -3131,6 +3139,7 @@ $(BUILT_TARGET_FILES_PACKAGE): \ 
		$(INSTALLED_ANDROID_INFO_TXT_TARGET) \

		$(INSTALLED_KERNEL_TARGET) \

		$(INSTALLED_2NDBOOTLOADER_TARGET) \

		$(BOARD_PREBUILT_DTBOIMAGE) \

		$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SYSTEM_BASE_FS_PATH) \

		$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_VENDOR_BASE_FS_PATH) \

		$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_PRODUCT_BASE_FS_PATH) \
@@ -3167,7 +3176,7 @@ ifdef INSTALLED_2NDBOOTLOADER_TARGET 
	$(hide) cp $(INSTALLED_2NDBOOTLOADER_TARGET) $(zip_root)/$(PRIVATE_RECOVERY_OUT)/second

endif

ifdef BOARD_INCLUDE_RECOVERY_DTBO

	$(hide) cp $(INSTALLED_DTBOIMAGE_TARGET) $(zip_root)/$(PRIVATE_RECOVERY_OUT)/recovery_dtbo

	$(hide) cp $(BOARD_PREBUILT_DTBOIMAGE) $(zip_root)/$(PRIVATE_RECOVERY_OUT)/recovery_dtbo

endif

ifdef INTERNAL_KERNEL_CMDLINE

	$(hide) echo "$(INTERNAL_KERNEL_CMDLINE)" > $(zip_root)/$(PRIVATE_RECOVERY_OUT)/cmdline