StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Treehugger Robot
2024-08-06 17:54:42 +00:00
committed by Gerrit Code Review
parent 699f9be18a 3a38f1f108
commit f4a9dab360
1 changed files with 25 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
core/Makefile
View File

@@ -7863,9 +7863,7 @@ $(call dist-for-goals,haiku-presubmit,$(SOONG_PRESUBMIT_FUZZ_PACKAGING_ARCH_MODU
include $(BUILD_SYSTEM)/layoutlib_data.mk include $(BUILD_SYSTEM)/layoutlib_data.mk
# ----------------------------------------------------------------- # -----------------------------------------------------------------
# Desktop pack image hook. # Desktop pack common variables.
ifneq (,$(strip $(PACK_DESKTOP_FILESYSTEM_IMAGES)))
PACK_IMAGE_TARGET := $(PRODUCT_OUT)/android-desktop_image.bin
PACK_IMAGE_SCRIPT := $(HOST_OUT_EXECUTABLES)/pack_image PACK_IMAGE_SCRIPT := $(HOST_OUT_EXECUTABLES)/pack_image
IMAGES := $(INSTALLED_BOOTIMAGE_TARGET) \ IMAGES := $(INSTALLED_BOOTIMAGE_TARGET) \
$(INSTALLED_SUPERIMAGE_TARGET) \ $(INSTALLED_SUPERIMAGE_TARGET) \
@@ -7874,6 +7872,11 @@ IMAGES := $(INSTALLED_BOOTIMAGE_TARGET) \
$(INSTALLED_VBMETAIMAGE_TARGET) \ $(INSTALLED_VBMETAIMAGE_TARGET) \
$(INSTALLED_USERDATAIMAGE_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_TARGET): $(IMAGES) $(PACK_IMAGE_SCRIPT)
$(PACK_IMAGE_SCRIPT) --out_dir $(PRODUCT_OUT) --noarchive $(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 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 # OS Licensing