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

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

Merge "core/Makefile: Add experimental desktop update image option" into main am: cd2ab832 

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



Change-Id: If6b23e1193629e839e21fe99cacbda0b59803a67
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 77684e91 cd2ab832

core/Makefile

+6 −1
Original line number Diff line number Diff line
@@ -7985,9 +7985,14 @@ endif # PACK_DESKTOP_RECOVERY_IMAGE 
# Desktop pack update image hook.

ifneq (,$(strip $(PACK_DESKTOP_UPDATE_IMAGE)))

PACK_UPDATE_IMAGE_TARGET := $(PRODUCT_OUT)/android-desktop_update_image.bin

PACK_UPDATE_IMAGE_ARGS := --noarchive --update



ifneq (,$(strip $(PACK_UPDATE_IMAGE_EXPERIMENTAL)))

PACK_UPDATE_IMAGE_ARGS += --experimental

endif # PACK_UPDATE_IMAGE_EXPERIMENTAL



$(PACK_UPDATE_IMAGE_TARGET): $(IMAGES) $(PACK_IMAGE_SCRIPT)

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

	$(PACK_IMAGE_SCRIPT) --out_dir $(PRODUCT_OUT) $(PACK_UPDATE_IMAGE_ARGS)



PACKED_UPDATE_IMAGE_ARCHIVE_TARGET := $(PACK_UPDATE_IMAGE_TARGET).gz