From 8ea29213e2f77586fe168cec30b270794d91b8dd Mon Sep 17 00:00:00 2001 From: Yifan Hong Date: Mon, 27 Apr 2020 19:06:59 -0700 Subject: [PATCH] Adjust partition size checks for recovery resources RECOVERY_FROM_BOOT_PATCH has been moved to vendor as per b/68319577. Hence, the reserved size should be moved from system to vendor as well. Bug: 68319577 Bug: 153581609 Test: m target-files-package for non-A/B devices Change-Id: I2fd3fea10ec6dd06f19c5be753d63ddff1ec01f7 (cherry picked from commit 9a3cad95a977e3d7c58c7f7e0fc327a65de84acd) Merged-In: I2fd3fea10ec6dd06f19c5be753d63ddff1ec01f7 --- core/Makefile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/core/Makefile b/core/Makefile index 6809d24f6..8cc722948 100644 --- a/core/Makefile +++ b/core/Makefile @@ -2712,10 +2712,10 @@ endif # BOARD_USES_FULL_RECOVERY_IMAGE endif # INSTALLED_RECOVERYIMAGE_TARGET endif # INSTALLED_BOOTIMAGE_TARGET -$(INSTALLED_SYSTEMIMAGE_TARGET): $(BUILT_SYSTEMIMAGE) $(RECOVERY_FROM_BOOT_PATCH) +$(INSTALLED_SYSTEMIMAGE_TARGET): $(BUILT_SYSTEMIMAGE) @echo "Install system fs image: $@" $(copy-file-to-target) - $(hide) $(call assert-max-image-size,$@ $(RECOVERY_FROM_BOOT_PATCH),$(BOARD_SYSTEMIMAGE_PARTITION_SIZE)) + $(hide) $(call assert-max-image-size,$@,$(BOARD_SYSTEMIMAGE_PARTITION_SIZE)) systemimage: $(INSTALLED_SYSTEMIMAGE_TARGET) @@ -3080,7 +3080,7 @@ define build-vendorimage-target $(BUILD_IMAGE) \ $(TARGET_OUT_VENDOR) $(vendorimage_intermediates)/vendor_image_info.txt \ $(INSTALLED_VENDORIMAGE_TARGET) $(TARGET_OUT) - $(call assert-max-image-size,$(INSTALLED_VENDORIMAGE_TARGET),$(BOARD_VENDORIMAGE_PARTITION_SIZE)) + $(call assert-max-image-size,$(INSTALLED_VENDORIMAGE_TARGET) $(RECOVERY_FROM_BOOT_PATCH),$(BOARD_VENDORIMAGE_PARTITION_SIZE)) endef # We just build this directly to the install location. @@ -3088,7 +3088,8 @@ INSTALLED_VENDORIMAGE_TARGET := $(BUILT_VENDORIMAGE_TARGET) $(INSTALLED_VENDORIMAGE_TARGET): \ $(INTERNAL_USERIMAGES_DEPS) \ $(INTERNAL_VENDORIMAGE_FILES) \ - $(INSTALLED_FILES_FILE_VENDOR) + $(INSTALLED_FILES_FILE_VENDOR) \ + $(RECOVERY_FROM_BOOT_PATCH) $(build-vendorimage-target) .PHONY: vendorimage-nodeps vnod