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

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

Merge "Enable uploading ramdisk to target img.zip"

parents e1faea86 1605938e

core/Makefile

+8 −0
Original line number Original line Diff line number Diff line
@@ -4395,6 +4395,7 @@ $(BUILT_TARGET_FILES_PACKAGE): \ 
	    $(INSTALLED_CUSTOMIMAGES_TARGET) \

	    $(INSTALLED_CUSTOMIMAGES_TARGET) \

	    $(INSTALLED_ANDROID_INFO_TXT_TARGET) \

	    $(INSTALLED_ANDROID_INFO_TXT_TARGET) \

	    $(INSTALLED_KERNEL_TARGET) \

	    $(INSTALLED_KERNEL_TARGET) \

	    $(INSTALLED_RAMDISK_TARGET) \

	    $(INSTALLED_DTBIMAGE_TARGET) \

	    $(INSTALLED_DTBIMAGE_TARGET) \

	    $(INSTALLED_2NDBOOTLOADER_TARGET) \

	    $(INSTALLED_2NDBOOTLOADER_TARGET) \

	    $(BOARD_PREBUILT_DTBOIMAGE) \

	    $(BOARD_PREBUILT_DTBOIMAGE) \
@@ -4562,6 +4563,13 @@ endif 
	@# Extra contents of the OTA package

	@# Extra contents of the OTA package

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

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

	$(hide) cp $(INSTALLED_ANDROID_INFO_TXT_TARGET) $(zip_root)/OTA/

	$(hide) cp $(INSTALLED_ANDROID_INFO_TXT_TARGET) $(zip_root)/OTA/

ifdef BUILDING_RAMDISK_IMAGE

ifeq (true,$(BOARD_IMG_USE_RAMDISK))

	@# Contents of the ramdisk image

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

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

endif

endif

ifeq ($(TARGET_OTA_ALLOW_NON_AB),true)

ifeq ($(TARGET_OTA_ALLOW_NON_AB),true)

ifneq ($(built_ota_tools),)

ifneq ($(built_ota_tools),)

	$(hide) mkdir -p $(zip_root)/OTA/bin

	$(hide) mkdir -p $(zip_root)/OTA/bin