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

Commit fbecdcf9 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes I9663220b,I15ced0ac 

* changes:
  Fix BOARD_PREBUILT_(VENDOR|ODM)_DLKMIMAGE support in target-files.zip
  Fix incorrect conditional comment in target-files.zip rule
parents 6f2a44a0 6af7cbe8

core/Makefile

+7 −3
Original line number Diff line number Diff line
@@ -4419,7 +4419,7 @@ endif 
ifdef BOARD_KERNEL_PAGESIZE

	echo "$(BOARD_KERNEL_PAGESIZE)" > $(zip_root)/$(PRIVATE_RECOVERY_OUT)/pagesize

endif

endif # INSTALLED_VENDOR_BOOTIMAGE_TARGET not defined

endif # not (BUILDING_VENDOR_BOOT_IMAGE and AB_OTA_UPDATER)

endif # INSTALLED_RECOVERYIMAGE_TARGET defined or BOARD_USES_RECOVERY_AS_BOOT is true

	@# Components of the boot image

	$(hide) mkdir -p $(zip_root)/BOOT
@@ -4609,9 +4609,13 @@ ifdef BOARD_PREBUILT_ODMIMAGE 
	$(hide) mkdir -p $(zip_root)/IMAGES

	$(hide) cp $(INSTALLED_ODMIMAGE_TARGET) $(zip_root)/IMAGES/

endif

ifdef BOARD_PREBUILT_VENDOR_DLKIMMAGE

ifdef BOARD_PREBUILT_VENDOR_DLKMIMAGE

	$(hide) mkdir -p $(zip_root)/IMAGES

	$(hide) cp $(INSTALLED_VENDOR_DLKMIMAGE_TARGET) $(zip_root)/IMAGES/

endif

ifdef BOARD_PREBUILT_ODM_DLKMIMAGE

	$(hide) mkdir -p $(zip_root)/IMAGES

	$(hide) cp $(INSTALLED_VENDOR_DLKIMMAGE_TARGET) $(zip_root)/IMAGES/

	$(hide) cp $(INSTALLED_ODM_DLKMIMAGE_TARGET) $(zip_root)/IMAGES/

endif

ifdef BOARD_PREBUILT_DTBOIMAGE

	$(hide) mkdir -p $(zip_root)/PREBUILT_IMAGES