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

Commit 78856676 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "core/Makefile: Add experimental desktop recovery image option" into... 

Merge "core/Makefile: Add experimental desktop recovery image option" into main am: c3db07bd am: 16645161

Original change: https://android-review.googlesource.com/c/platform/build/+/3288225



Change-Id: If2b692537655ac1f0da9e43c9b994d4b4250a248
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 15da2312 16645161

core/Makefile

+6 −1
Original line number Diff line number Diff line
@@ -7950,9 +7950,14 @@ 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_ARGS := --noarchive --recovery



ifneq (,$(strip $(PACK_RECOVERY_IMAGE_EXPERIMENTAL)))

PACK_RECOVERY_IMAGE_ARGS += --experimental

endif # PACK_RECOVERY_IMAGE_EXPERIMENTAL



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

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

	$(PACK_IMAGE_SCRIPT) --out_dir $(PRODUCT_OUT) $(PACK_RECOVERY_IMAGE_ARGS)



PACKED_RECOVERY_IMAGE_ARCHIVE_TARGET := $(PACK_RECOVERY_IMAGE_TARGET).gz