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

Commit bc95152e authored by Aaron Kling's avatar Aaron Kling
Browse files

Revert "Disable sparse images for A/B updater targets" 

This reverts commit a927af67.

The original change breaks building vendor image for legacy A/B devices
with a recovery partition. Because build checks the out image size plus
the recovery patch size. If sparse images are disabled, then the output
image size will always be the max size. And max size plus anything will
always be greater than max size.

Change-Id: I87dd2bf78e9080d1fc2d320df7e98ee98efa031c
parent 9531801b

core/Makefile

+3 −5
Original line number Diff line number Diff line
@@ -2155,11 +2155,9 @@ $(if $(BOARD_$(_var)IMAGE_SQUASHFS_COMPRESSOR),$(hide) echo "$(1)_squashfs_compr 
$(if $(BOARD_$(_var)IMAGE_SQUASHFS_COMPRESSOR_OPT),$(hide) echo "$(1)_squashfs_compressor_opt=$(BOARD_$(_var)IMAGE_SQUASHFS_COMPRESSOR_OPT)" >> $(2))

$(if $(BOARD_$(_var)IMAGE_SQUASHFS_DISABLE_4K_ALIGN),$(hide) echo "$(1)_squashfs_disable_4k_align=$(BOARD_$(_var)IMAGE_SQUASHFS_DISABLE_4K_ALIGN)" >> $(2))

$(if $(PRODUCT_$(_var)_BASE_FS_PATH),$(hide) echo "$(1)_base_fs_file=$(PRODUCT_$(_var)_BASE_FS_PATH)" >> $(2))

$(if $(filter true,$(AB_OTA_UPDATER)),,\

$(eval _size := $(BOARD_$(_var)IMAGE_PARTITION_SIZE))

$(eval _reserved := $(BOARD_$(_var)IMAGE_PARTITION_RESERVED_SIZE))

$(eval _headroom := $(PRODUCT_$(_var)_HEADROOM))

)

$(if $(or $(_size), $(_reserved), $(_headroom)),,

    $(hide) echo "$(1)_disable_sparse=true" >> $(2))

$(call add-common-flags-to-image-props,$(1),$(2))