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

Commit 60ac3778 authored by Yifan Hong's avatar Yifan Hong Committed by Po-Chien Hsueh
Browse files

build_image.py recognize BOARD_PRODUCTIMAGE_PARTITION_RESERVED_SIZE 

Test: builds
Bug: 79106666
Change-Id: I26aba694fd3d6a2feed7601524dde52569ba41e2
Merged-In: I26aba694fd3d6a2feed7601524dde52569ba41e2
(cherry picked from commit 56a6c3bb)
parent 80022306

core/Makefile

+6 −2
Original line number Diff line number Diff line
@@ -1152,6 +1152,7 @@ $(if $(filter $(2),product),\ 
    $(if $(BOARD_PRODUCTIMAGE_SQUASHFS_BLOCK_SIZE),$(hide) echo "product_squashfs_block_size=$(BOARD_PRODUCTIMAGE_SQUASHFS_BLOCK_SIZE)" >> $(1))

    $(if $(BOARD_PRODUCTIMAGE_SQUASHFS_DISABLE_4K_ALIGN),$(hide) echo "product_squashfs_disable_4k_align=$(BOARD_PRODUCTIMAGE_SQUASHFS_DISABLE_4K_ALIGN)" >> $(1))

    $(if $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_PRODUCT_BASE_FS_PATH),$(hide) echo "product_base_fs_file=$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_PRODUCT_BASE_FS_PATH)" >> $(1))

    $(if $(BOARD_PRODUCTIMAGE_PARTITION_RESERVED_SIZE),$(hide) echo "product_reserved_size=$(BOARD_PRODUCTIMAGE_PARTITION_RESERVED_SIZE)" >> $(1))

)

$(if $(filter $(2),oem),\

    $(if $(BOARD_OEMIMAGE_PARTITION_SIZE),$(hide) echo "oem_size=$(BOARD_OEMIMAGE_PARTITION_SIZE)" >> $(1))
@@ -2104,8 +2105,11 @@ define build-productimage-target 
  $(call generate-image-prop-dictionary, $(productimage_intermediates)/product_image_info.txt,product,skip_fsck=true)

  $(hide) PATH=$(foreach p,$(INTERNAL_USERIMAGES_BINARY_PATHS),$(p):)$$PATH \

      ./build/tools/releasetools/build_image.py \

      $(TARGET_OUT_PRODUCT) $(productimage_intermediates)/product_image_info.txt $(INSTALLED_PRODUCTIMAGE_TARGET) $(TARGET_OUT)

  $(hide) $(call assert-max-image-size,$(INSTALLED_PRODUCTIMAGE_TARGET),$(BOARD_PRODUCTIMAGE_PARTITION_SIZE))

      $(TARGET_OUT_PRODUCT) $(productimage_intermediates)/product_image_info.txt $(INSTALLED_PRODUCTIMAGE_TARGET) $(TARGET_OUT) \

      $(productimage_intermediates)/generated_product_image_info.txt

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

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

          $(productimage_intermediates)/generated_product_image_info.txt,product_size))

endef



# We just build this directly to the install location.

core/config.mk

+7 −0
Original line number Diff line number Diff line
@@ -948,6 +948,13 @@ $(error Should not define BOARD_VENDORIMAGE_PARTITION_SIZE and \ 
endif

endif



ifneq ($(BOARD_PRODUCTIMAGE_PARTITION_SIZE),)

ifneq ($(BOARD_PRODUCTIMAGE_PARTITION_RESERVED_SIZE),)

$(error Should not define BOARD_PRODUCTIMAGE_PARTITION_SIZE and \

    BOARD_PRODUCTIMAGE_PARTITION_RESERVED_SIZE together)

endif

endif



endif # USE_LOGICAL_PARTITIONS



# ###############################################################

core/product.mk

+1 −0
Original line number Diff line number Diff line
@@ -326,6 +326,7 @@ _product_stash_var_list += \ 
_product_stash_var_list += \

	BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE \

	BOARD_VENDORIMAGE_PARTITION_RESERVED_SIZE \

	BOARD_PRODUCTIMAGE_PARTITION_RESERVED_SIZE \

	BOARD_SUPER_PARTITION_SIZE \

	BOARD_SUPER_PARTITION_PARTITION_LIST \

tools/releasetools/build_image.py

+3 −0
Original line number Diff line number Diff line
@@ -877,6 +877,7 @@ def ImagePropFromGlobalDict(glob_dict, mount_point): 
    copy_prop("product_extfs_inode_count", "extfs_inode_count")

    if not copy_prop("product_extfs_rsv_pct", "extfs_rsv_pct"):

      d["extfs_rsv_pct"] = "0"

    copy_prop("product_reserved_size", "partition_reserved_size")

  elif mount_point == "oem":

    copy_prop("fs_type", "fs_type")

    copy_prop("oem_size", "partition_size")
@@ -916,6 +917,8 @@ def GlobalDictFromImageProp(image_prop, mount_point): 
    copy_prop("partition_size", "system_size")

  elif mount_point == "vendor":

    copy_prop("partition_size", "vendor_size")

  elif mount_point == "product":

    copy_prop("partition_size", "product_size")

  return d