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

Commit fe421ed2 authored by Yifan Hong's avatar Yifan Hong Committed by android-build-merger
Browse files

Merge changes from topic "board_partition_reserved_size" 

am: 2d90c246

Change-Id: I460ea917b47a61acb0cbb0f17a867d15f61c7d6d
parents f87ea90d 2d90c246

core/Makefile

+12 −4
Original line number Diff line number Diff line
@@ -1213,6 +1213,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),productservices),\

    $(if $(BOARD_PRODUCT_SERVICESIMAGE_FILE_SYSTEM_TYPE),$(hide) echo "productservices_fs_type=$(BOARD_PRODUCT_SERVICESIMAGE_FILE_SYSTEM_TYPE)" >> $(1))
@@ -1224,6 +1225,7 @@ $(if $(filter $(2),productservices),\ 
    $(if $(BOARD_PRODUCT_SERVICESIMAGE_SQUASHFS_COMPRESSOR_OPT),$(hide) echo "productservices_squashfs_compressor_opt=$(BOARD_PRODUCT_SERVICESIMAGE_SQUASHFS_COMPRESSOR_OPT)" >> $(1))

    $(if $(BOARD_PRODUCT_SERVICESIMAGE_SQUASHFS_BLOCK_SIZE),$(hide) echo "productservices_squashfs_block_size=$(BOARD_PRODUCT_SERVICESIMAGE_SQUASHFS_BLOCK_SIZE)" >> $(1))

    $(if $(BOARD_PRODUCT_SERVICESIMAGE_SQUASHFS_DISABLE_4K_ALIGN),$(hide) echo "productservices_squashfs_disable_4k_align=$(BOARD_PRODUCT_SERVICESIMAGE_SQUASHFS_DISABLE_4K_ALIGN)" >> $(1))

    $(if $(BOARD_PRODUCT_SERVICESIMAGE_PARTITION_RESERVED_SIZE),$(hide) echo "productservices_reserved_size=$(BOARD_PRODUCT_SERVICESIMAGE_PARTITION_RESERVED_SIZE)" >> $(1))

)

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

    $(if $(BOARD_OEMIMAGE_PARTITION_SIZE),$(hide) echo "oem_size=$(BOARD_OEMIMAGE_PARTITION_SIZE)" >> $(1))
@@ -2266,8 +2268,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.
@@ -2318,8 +2323,11 @@ define build-productservicesimage-target 
  $(call generate-userimage-prop-dictionary, $(productservicesimage_intermediates)/productservices_image_info.txt, skip_fsck=true)

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

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

      $(TARGET_OUT_PRODUCT_SERVICES) $(productservicesimage_intermediates)/productservices_image_info.txt $(INSTALLED_PRODUCT_SERVICESIMAGE_TARGET) $(TARGET_OUT)

  $(hide) $(call assert-max-image-size,$(INSTALLED_PRODUCT_SERVICESIMAGE_TARGET),$(BOARD_PRODUCT_SERVICESIMAGE_PARTITION_SIZE))

      $(TARGET_OUT_PRODUCT_SERVICES) $(productservicesimage_intermediates)/productservices_image_info.txt $(INSTALLED_PRODUCT_SERVICESIMAGE_TARGET) $(TARGET_OUT) \

      $(productservicesimage_intermediates)/generated_productservices_image_info.txt

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

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

          $(productservicesimage_intermediates)/generated_productservices_image_info.txt,productservices_size))

endef



# We just build this directly to the install location.

core/config.mk

+14 −0
Original line number Diff line number Diff line
@@ -954,6 +954,20 @@ $(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



ifneq ($(BOARD_PRODUCT_SERVICESIMAGE_PARTITION_SIZE),)

ifneq ($(BOARD_PRODUCT_SERVICESIMAGE_PARTITION_RESERVED_SIZE),)

$(error Should not define BOARD_PRODUCT_SERVICESIMAGE_PARTITION_SIZE and \

    BOARD_PRODUCT_SERVICESIMAGE_PARTITION_RESERVED_SIZE together)

endif

endif



endif # USE_LOGICAL_PARTITIONS



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

core/product.mk

+2 −0
Original line number Diff line number Diff line
@@ -395,6 +395,8 @@ _product_stash_var_list += \ 
_product_stash_var_list += \

	BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE \

	BOARD_VENDORIMAGE_PARTITION_RESERVED_SIZE \

	BOARD_PRODUCTIMAGE_PARTITION_RESERVED_SIZE \

	BOARD_PRODUCT_SERVICESIMAGE_PARTITION_RESERVED_SIZE \

	BOARD_SUPER_PARTITION_SIZE \

	BOARD_SUPER_PARTITION_PARTITION_LIST \

tools/releasetools/build_image.py

+6 −0
Original line number Diff line number Diff line
@@ -875,6 +875,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 == "product-services":

    copy_prop("avb_productservices_hashtree_enable", "avb_hashtree_enable")

    copy_prop("avb_productservices_add_hashtree_footer_args",
@@ -896,6 +897,7 @@ def ImagePropFromGlobalDict(glob_dict, mount_point): 
    copy_prop("productservices_extfs_inode_count", "extfs_inode_count")

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

      d["extfs_rsv_pct"] = "0"

    copy_prop("productservices_reserved_size", "partition_reserved_size")

  elif mount_point == "oem":

    copy_prop("fs_type", "fs_type")

    copy_prop("oem_size", "partition_size")
@@ -935,6 +937,10 @@ 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")

  elif mount_point == "product-services":

    copy_prop("partition_size", "productservices_size")

  return d