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

Commit 50ea3f49 authored by Yifan Hong's avatar Yifan Hong Committed by Gerrit Code Review
Browse files

Merge "Adjust partition size checks for recovery resources"

parents 1d62e0db 9a3cad95

core/Makefile

+5 −4
Original line number Diff line number Diff line
@@ -2767,10 +2767,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)
@@ -3132,7 +3132,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.
@@ -3140,7 +3140,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