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

Commit b75e40a5 authored by Jae Hoon Kim's avatar Jae Hoon Kim
Browse files

Add support for writing partition image in recovery images 

This change updates the build system to account for dynamic GPT
partitioning on the device's internal disk when using recovery
images.

The `pack_recovery.sh` script requires the generated partition image
to correctly create a recovery image for devices that utilize
dynamic partitioning. This commit adds the necessary `--partition-image`
argument to the packing script invocation, passing the path to the
`gen-partition-image` output.

Bug: 427742917
Test: mma (in layout of desktop) + m pack-recovery-image
Flag: EXEMPT desktop only layout gen change
Change-Id: If1d4fc4c4c93513085c7f39132f4835af71c9f38
parent b0be8acc

core/Makefile

+8 −4
Original line number Diff line number Diff line
@@ -7988,6 +7988,10 @@ ifneq (,$(GENERATED_FW_IMAGE)) 
$(call dist-for-goals,dist_files,$(GENERATED_FW_IMAGE):${TARGET_PRODUCT}-firmware.img)

endif



# -----------------------------------------------------------------

# Desktop generated partition image.

GENERATED_PARTITION_IMAGE := $(call module-built-files,gen-partition-image)



# -----------------------------------------------------------------

# Desktop pack image hook.

ifneq (,$(strip $(PACK_DESKTOP_FILESYSTEM_IMAGES)))
@@ -8012,13 +8016,13 @@ endif # PACK_DESKTOP_FILESYSTEM_IMAGES 
# Desktop pack recovery image hook.

ifeq ($(BOARD_USES_DESKTOP_RECOVERY_IMAGE),true)

PACK_RECOVERY_IMAGE_TARGET := $(PRODUCT_OUT)/android-desktop_recovery_image.bin

PACK_RECOVERY_IMAGE_ARGS := --noarchive --recovery --firmware $(GENERATED_FW_IMAGE)

PACK_RECOVERY_IMAGE_ARGS := --noarchive --recovery --firmware $(GENERATED_FW_IMAGE) --partition-image $(GENERATED_PARTITION_IMAGE)



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

PACK_RECOVERY_IMAGE_ARGS += --experimental

endif # PACK_RECOVERY_IMAGE_EXPERIMENTAL



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

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

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



PACKED_RECOVERY_IMAGE_ARCHIVE_TARGET := $(PACK_RECOVERY_IMAGE_TARGET).zst
@@ -8062,13 +8066,13 @@ endif # BOARD_USES_DESKTOP_RECOVERY_IMAGE 
# Desktop pack update image hook.

ifeq ($(BOARD_USES_DESKTOP_UPDATE_IMAGE),true)

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

PACK_UPDATE_IMAGE_ARGS := --noarchive --update --firmware $(GENERATED_FW_IMAGE)

PACK_UPDATE_IMAGE_ARGS := --noarchive --update --firmware $(GENERATED_FW_IMAGE) --partition-image $(GENERATED_PARTITION_IMAGE)



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

PACK_UPDATE_IMAGE_ARGS += --experimental

endif # PACK_UPDATE_IMAGE_EXPERIMENTAL



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

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

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



PACKED_UPDATE_IMAGE_ARCHIVE_TARGET := $(PACK_UPDATE_IMAGE_TARGET).zst