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

Commit c5aae579 authored by Yifan Hong's avatar Yifan Hong
Browse files

Revert "Fix dynamic partition size check for devices with recovery" 

Reason for revert: size check is removed for devices
with dynamic partitions because it doesn't make sense.

Bug: 122377935
Bug: 120043292
Bug: 124489494
Test: build cuttlefish

This reverts commit accf09b2.

Change-Id: I289faf11a08acbcef36924eb747a15f55124ce79
Merged-In: I289faf11a08acbcef36924eb747a15f55124ce79
parent 5606d2b5

core/Makefile

+0 −13
Original line number Diff line number Diff line
@@ -2285,19 +2285,6 @@ endif # INSTALLED_BOOTIMAGE_TARGET 
$(INSTALLED_SYSTEMIMAGE_TARGET): $(BUILT_SYSTEMIMAGE) $(RECOVERY_FROM_BOOT_PATCH)

	@echo "Install system fs image: $@"

	$(copy-file-to-target)

ifdef RECOVERY_FROM_BOOT_PATCH

ifeq ($(PRODUCT_USE_DYNAMIC_PARTITION_SIZE),true)

ifeq ($(BOARD_SYSTEMIMAGE_PARTITION_SIZE),)

	# system image size is dynamic, hence system_size in generated_system_image_info.txt does not

	# have room for recovery from boot patch. Increase system_size so that check-all-partition-sizes

	# accounts for the size of the patch.

	sed -i'.bak' -e 's/^system_size=.*$$/system_size='"$$(( \

	      $(call read-image-prop-dictionary,$(systemimage_intermediates)/generated_system_image_info.txt,system_size) + \

	      $$($(call get-file-size,$(RECOVERY_FROM_BOOT_PATCH))) ))"'/' \

	    $(systemimage_intermediates)/generated_system_image_info.txt

endif

endif

endif

	$(hide) $(call assert-max-image-size,$@ $(RECOVERY_FROM_BOOT_PATCH),\

	    $(call read-image-prop-dictionary,\

	        $(systemimage_intermediates)/generated_system_image_info.txt,system_size))