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

Commit 58909c5a authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add pcluster and deduplication support for erofs images." am:... 

Merge "Add pcluster and deduplication support for erofs images." am: d8f17b1f am: 152d9803 am: b2c9e326 am: 0ad7bb9d am: 02ae4afc

Original change: https://android-review.googlesource.com/c/platform/build/+/1855880

Change-Id: Ia750c27b75109a05ef2197f8b2348897b6ba4857
parents e62b8dab 02ae4afc

core/Makefile

+4 −1
Original line number Diff line number Diff line
@@ -1617,7 +1617,8 @@ endef 
# $(2) the image prop file

define add-common-ro-flags-to-image-props

$(eval _var := $(call to-upper,$(1)))

$(if $(BOARD_$(_var)IMAGE_EROFS_COMPRESSOR),$(hide) echo "$(1)_erofs_compressor"$(BOARD_$(_var)IMAGE_EROFS_COMPRESSOR)" >> $(2))

$(if $(BOARD_$(_var)IMAGE_EROFS_COMPRESSOR),$(hide) echo "$(1)_erofs_compressor=$(BOARD_$(_var)IMAGE_EROFS_COMPRESSOR)" >> $(2))

$(if $(BOARD_$(_var)IMAGE_EROFS_PCLUSTER_SIZE),$(hide) echo "$(1)_erofs_pcluster_size=$(BOARD_$(_var)IMAGE_EROFS_PCLUSTER_SIZE)" >> $(2))

$(if $(BOARD_$(_var)IMAGE_EXTFS_INODE_COUNT),$(hide) echo "$(1)_extfs_inode_count=$(BOARD_$(_var)IMAGE_EXTFS_INODE_COUNT)" >> $(2))

$(if $(BOARD_$(_var)IMAGE_EXTFS_RSV_PCT),$(hide) echo "$(1)_extfs_rsv_pct=$(BOARD_$(_var)IMAGE_EXTFS_RSV_PCT)" >> $(2))

$(if $(BOARD_$(_var)IMAGE_F2FS_SLOAD_COMPRESS_FLAGS),$(hide) echo "$(1)_f2fs_sldc_flags=$(BOARD_$(_var)IMAGE_F2FS_SLOAD_COMPRESS_FLAGS)" >> $(2))
@@ -1699,6 +1700,8 @@ $(if $(INTERNAL_USERIMAGES_SPARSE_EROFS_FLAG),$(hide) echo "erofs_sparse_flag=$( 
$(if $(INTERNAL_USERIMAGES_SPARSE_SQUASHFS_FLAG),$(hide) echo "squashfs_sparse_flag=$(INTERNAL_USERIMAGES_SPARSE_SQUASHFS_FLAG)" >> $(1))

$(if $(INTERNAL_USERIMAGES_SPARSE_F2FS_FLAG),$(hide) echo "f2fs_sparse_flag=$(INTERNAL_USERIMAGES_SPARSE_F2FS_FLAG)" >> $(1))

$(if $(BOARD_EROFS_COMPRESSOR),$(hide) echo "erofs_default_compressor=$(BOARD_EROFS_COMPRESSOR)" >> $(1))

$(if $(BOARD_EROFS_PCLUSTER_SIZE),$(hide) echo "erofs_pcluster_size=$(BOARD_EROFS_PCLUSTER_SIZE)" >> $(1))

$(if $(BOARD_EROFS_SHARE_DUP_BLOCKS),$(hide) echo "erofs_share_dup_blocks=$(BOARD_EROFS_SHARE_DUP_BLOCKS)" >> $(1))

$(if $(BOARD_EXT4_SHARE_DUP_BLOCKS),$(hide) echo "ext4_share_dup_blocks=$(BOARD_EXT4_SHARE_DUP_BLOCKS)" >> $(1))

$(if $(BOARD_FLASH_LOGICAL_BLOCK_SIZE), $(hide) echo "flash_logical_block_size=$(BOARD_FLASH_LOGICAL_BLOCK_SIZE)" >> $(1))

$(if $(BOARD_FLASH_ERASE_BLOCK_SIZE), $(hide) echo "flash_erase_block_size=$(BOARD_FLASH_ERASE_BLOCK_SIZE)" >> $(1))

tools/releasetools/build_image.py

+8 −0
Original line number Diff line number Diff line
@@ -343,6 +343,10 @@ def BuildImageMkfs(in_dir, prop_dict, out_file, target_out, fs_config): 
      build_command.extend(["-U", prop_dict["uuid"]])

    if "block_list" in prop_dict:

      build_command.extend(["-B", prop_dict["block_list"]])

    if "erofs_pcluster_size" in prop_dict:

      build_command.extend(["-P", prop_dict["erofs_pcluster_size"]])

    if "erofs_share_dup_blocks" in prop_dict:

      build_command.extend(["-k", "4096"])

  elif fs_type.startswith("squash"):

    build_command = ["mksquashfsimage.sh"]

    build_command.extend([in_dir, out_file])
@@ -617,6 +621,8 @@ def ImagePropFromGlobalDict(glob_dict, mount_point): 
  common_props = (

      "extfs_sparse_flag",

      "erofs_default_compressor",

      "erofs_pcluster_size",

      "erofs_share_dup_blocks",

      "erofs_sparse_flag",

      "squashfs_sparse_flag",

      "system_f2fs_compress",
@@ -666,6 +672,8 @@ def ImagePropFromGlobalDict(glob_dict, mount_point): 
      (True, "{}_base_fs_file", "base_fs_file"),

      (True, "{}_disable_sparse", "disable_sparse"),

      (True, "{}_erofs_compressor", "erofs_compressor"),

      (True, "{}_erofs_pcluster_size", "erofs_pcluster_size"),

      (True, "{}_erofs_share_dup_blocks", "erofs_share_dup_blocks"),

      (True, "{}_extfs_inode_count", "extfs_inode_count"),

      (True, "{}_f2fs_compress", "f2fs_compress"),

      (True, "{}_f2fs_sldc_flags", "f2fs_sldc_flags"),