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

Commit 5f805eae authored by Li-Yu Yu's avatar Li-Yu Yu
Browse files

Add missing desktop deps to kernels 

This is the last piece before we can run `m pack-*-image`
without running `m` first.

Also fix pack-migration-image broken by http://ag/32744404.

Fix: 361789228
Test: m pack-recovery-image
Test: m pack-update-image
Test: m pack-migration-image ANDROID_DESKTOP_MIGRATION_IMAGE=true
Change-Id: Ie557ee7ac1d6e24b37e6bbea0ac4fb199a381608
parent 197075a4

core/Makefile

+3 −3
Original line number Diff line number Diff line
@@ -7980,7 +7980,7 @@ ifneq (,$(strip $(PACK_RECOVERY_IMAGE_EXPERIMENTAL))) 
PACK_RECOVERY_IMAGE_ARGS += --experimental

endif # PACK_RECOVERY_IMAGE_EXPERIMENTAL



$(PACK_RECOVERY_IMAGE_TARGET): $(PACK_IMAGE_DEPS)

$(PACK_RECOVERY_IMAGE_TARGET): $(PACK_IMAGE_DEPS) $(PRODUCT_OUT)/recovery-kernel

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



PACKED_RECOVERY_IMAGE_ARCHIVE_TARGET := $(PACK_RECOVERY_IMAGE_TARGET).gz
@@ -8030,7 +8030,7 @@ ifneq (,$(strip $(PACK_UPDATE_IMAGE_EXPERIMENTAL))) 
PACK_UPDATE_IMAGE_ARGS += --experimental

endif # PACK_UPDATE_IMAGE_EXPERIMENTAL



$(PACK_UPDATE_IMAGE_TARGET): $(PACK_IMAGE_DEPS)

$(PACK_UPDATE_IMAGE_TARGET): $(PACK_IMAGE_DEPS) $(PRODUCT_OUT)/update-kernel

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



PACKED_UPDATE_IMAGE_ARCHIVE_TARGET := $(PACK_UPDATE_IMAGE_TARGET).gz
@@ -8052,7 +8052,7 @@ PACK_MIGRATION_IMAGE_SCRIPT := $(HOST_OUT_EXECUTABLES)/pack_migration_image 
ifeq ($(ANDROID_DESKTOP_MIGRATION_IMAGE),true)

PACK_MIGRATION_IMAGE_TARGET := $(PRODUCT_OUT)/android-desktop_migration_image.bin



$(PACK_MIGRATION_IMAGE_TARGET): $(IMAGES) $(PACK_MIGRATION_IMAGE_SCRIPT)

$(PACK_MIGRATION_IMAGE_TARGET): $(PACK_IMAGE_DEPS) $(PACK_MIGRATION_IMAGE_SCRIPT)

	$(PACK_MIGRATION_IMAGE_SCRIPT) --out_dir $(PRODUCT_OUT) --noarchive



PACKED_MIGRATION_IMAGE_ARCHIVE_TARGET := $(PACK_MIGRATION_IMAGE_TARGET).gz