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

Commit 5d6a4278 authored by Sandeep Dhavale's avatar Sandeep Dhavale Committed by Automerger Merge Worker
Browse files

Merge "Add support for specifying erofs blocksize" into main am: cc1a5602 am: ffc0e25f 

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



Change-Id: Id296cc39d0dfdffc46502842fc751a248ba3e03f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c61743ff ffc0e25f

core/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -2131,6 +2131,7 @@ $(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_COMPRESS_HINTS),$(hide) echo "$(1)_erofs_compress_hints=$(BOARD_$(_var)IMAGE_EROFS_COMPRESS_HINTS)" >> $(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_EROFS_BLOCKSIZE),$(hide) echo "$(1)_erofs_blocksize=$(BOARD_$(_var)IMAGE_EROFS_BLOCKSIZE)" >> $(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))
@@ -2220,6 +2221,7 @@ $(if $(filter true,$(TARGET_USERIMAGES_SPARSE_F2FS_DISABLED)),,$(hide) echo "f2f 
$(if $(BOARD_EROFS_COMPRESSOR),$(hide) echo "erofs_default_compressor=$(BOARD_EROFS_COMPRESSOR)" >> $(1))

$(if $(BOARD_EROFS_COMPRESS_HINTS),$(hide) echo "erofs_default_compress_hints=$(BOARD_EROFS_COMPRESS_HINTS)" >> $(1))

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

$(if $(BOARD_EROFS_BLOCKSIZE),$(hide) echo "erofs_blocksize=$(BOARD_EROFS_BLOCKSIZE)" >> $(1))

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

$(if $(BOARD_EROFS_USE_LEGACY_COMPRESSION),$(hide) echo "erofs_use_legacy_compression=$(BOARD_EROFS_USE_LEGACY_COMPRESSION)" >> $(1))

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

tools/releasetools/build_image.py

+4 −0
Original line number Diff line number Diff line
@@ -353,6 +353,8 @@ def BuildImageMkfs(in_dir, prop_dict, out_file, target_out, fs_config): 
    if compress_hints:

      build_command.extend(["--compress-hints", compress_hints])



    build_command.extend(["-b", prop_dict.get("erofs_blocksize", "4096")])



    build_command.extend(["--mount-point", prop_dict["mount_point"]])

    if target_out:

      build_command.extend(["--product-out", target_out])
@@ -711,6 +713,7 @@ def ImagePropFromGlobalDict(glob_dict, mount_point): 
      "erofs_default_compressor",

      "erofs_default_compress_hints",

      "erofs_pcluster_size",

      "erofs_blocksize",

      "erofs_share_dup_blocks",

      "erofs_sparse_flag",

      "erofs_use_legacy_compression",
@@ -762,6 +765,7 @@ def ImagePropFromGlobalDict(glob_dict, mount_point): 
      (True, "{}_erofs_compressor", "erofs_compressor"),

      (True, "{}_erofs_compress_hints", "erofs_compress_hints"),

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

      (True, "{}_erofs_blocksize", "erofs_blocksize"),

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

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

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