From 292418536261c6cf7bcf6f1bacf135b604cfe9ff Mon Sep 17 00:00:00 2001 From: LuK1337 Date: Wed, 25 Oct 2023 18:10:03 +0200 Subject: [PATCH] Disable sparse images for A/B updater targets In past, brillo_update_payload was unsparsing all images before putting them in payload.bin, now we ought to unsparse them ourselves here. Change-Id: I69baa71678f8116ed8e256bd629a1af9bad13ba8 --- core/Makefile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/core/Makefile b/core/Makefile index 1c6256ee35..430b33ad43 100644 --- a/core/Makefile +++ b/core/Makefile @@ -2142,9 +2142,11 @@ $(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)) -$(eval _size := $(BOARD_$(_var)IMAGE_PARTITION_SIZE)) -$(eval _reserved := $(BOARD_$(_var)IMAGE_PARTITION_RESERVED_SIZE)) -$(eval _headroom := $(PRODUCT_$(_var)_HEADROOM)) +$(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))