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

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

Merge "core/Makefile: Add desktop recovery image target hook" into main

parents 699f9be1 3a38f1f1

core/Makefile

+25 −3
Original line number Diff line number Diff line
@@ -7863,9 +7863,7 @@ $(call dist-for-goals,haiku-presubmit,$(SOONG_PRESUBMIT_FUZZ_PACKAGING_ARCH_MODU 
include $(BUILD_SYSTEM)/layoutlib_data.mk



# -----------------------------------------------------------------

# Desktop pack image hook.

ifneq (,$(strip $(PACK_DESKTOP_FILESYSTEM_IMAGES)))

PACK_IMAGE_TARGET := $(PRODUCT_OUT)/android-desktop_image.bin

# Desktop pack common variables.

PACK_IMAGE_SCRIPT := $(HOST_OUT_EXECUTABLES)/pack_image

IMAGES := $(INSTALLED_BOOTIMAGE_TARGET) \

	$(INSTALLED_SUPERIMAGE_TARGET) \
@@ -7874,6 +7872,11 @@ IMAGES := $(INSTALLED_BOOTIMAGE_TARGET) \ 
	$(INSTALLED_VBMETAIMAGE_TARGET) \

	$(INSTALLED_USERDATAIMAGE_TARGET)



# -----------------------------------------------------------------

# Desktop pack image hook.

ifneq (,$(strip $(PACK_DESKTOP_FILESYSTEM_IMAGES)))

PACK_IMAGE_TARGET := $(PRODUCT_OUT)/android-desktop_image.bin



$(PACK_IMAGE_TARGET): $(IMAGES) $(PACK_IMAGE_SCRIPT)

	$(PACK_IMAGE_SCRIPT) --out_dir $(PRODUCT_OUT) --noarchive
@@ -7888,6 +7891,25 @@ $(call dist-for-goals,dist_files,$(PACKED_IMAGE_ARCHIVE_TARGET)) 


endif # PACK_DESKTOP_FILESYSTEM_IMAGES



# -----------------------------------------------------------------

# Desktop pack recovery image hook.

ifneq (,$(strip $(PACK_DESKTOP_RECOVERY_IMAGE)))

PACK_RECOVERY_IMAGE_TARGET := $(PRODUCT_OUT)/android-desktop_recovery_image.bin



$(PACK_RECOVERY_IMAGE_TARGET): $(IMAGES) $(PACK_IMAGE_SCRIPT)

	$(PACK_IMAGE_SCRIPT) --out_dir $(PRODUCT_OUT) --noarchive --recovery



PACKED_RECOVERY_IMAGE_ARCHIVE_TARGET := $(PACK_RECOVERY_IMAGE_TARGET).gz



$(PACKED_RECOVERY_IMAGE_ARCHIVE_TARGET): $(PACK_RECOVERY_IMAGE_TARGET) | $(GZIP)

	$(GZIP) -fk $(PACK_RECOVERY_IMAGE_TARGET)



droidcore-unbundled: $(PACKED_RECOVERY_IMAGE_ARCHIVE_TARGET)



$(call dist-for-goals,dist_files,$(PACKED_RECOVERY_IMAGE_ARCHIVE_TARGET))



endif # PACK_DESKTOP_RECOVERY_IMAGE



# -----------------------------------------------------------------

# OS Licensing