From 3a38f1f1082e8254cc50c4ec2d02c1febdb9fb27 Mon Sep 17 00:00:00 2001 From: Jae Hoon Kim Date: Fri, 2 Aug 2024 06:54:41 +0000 Subject: [PATCH] core/Makefile: Add desktop recovery image target hook .. allowing for targets to trigger recovery image builds. Bug: b:343235730, b:355487693 Test: m, with desktop target enabling PACK_DESKTOP_RECOVERY_IMAGES Flag: EXEMPT desktop only change Change-Id: Idd5483747283aeba8086a90b7eb0590e47b9549e --- core/Makefile | 28 +++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-) diff --git a/core/Makefile b/core/Makefile index 5ec5a94b57..96588e3976 100644 --- a/core/Makefile +++ b/core/Makefile @@ -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