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

Commit 05c690dd authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add build flags for legacy EROFS support." am: 80d2c8f7 

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



Change-Id: I65b39ed4ad81db9c6a0c222f5d3eaadd3ee33356
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7b536df9 80d2c8f7

core/Makefile

+5 −0
Original line number Original line Diff line number Diff line
@@ -1765,8 +1765,12 @@ ifneq ($(filter \ 
    $(BOARD_SYSTEM_DLKMIMAGE_FILE_SYSTEM_TYPE) \

    $(BOARD_SYSTEM_DLKMIMAGE_FILE_SYSTEM_TYPE) \

  ,erofs),)

  ,erofs),)

INTERNAL_USERIMAGES_DEPS += $(MKEROFS)

INTERNAL_USERIMAGES_DEPS += $(MKEROFS)

ifeq ($(BOARD_EROFS_USE_LEGACY_COMPRESSION),true)

BOARD_EROFS_COMPRESSOR ?= "lz4"

else

BOARD_EROFS_COMPRESSOR ?= "lz4hc,9"

BOARD_EROFS_COMPRESSOR ?= "lz4hc,9"

endif

endif

endif





ifneq ($(filter \

ifneq ($(filter \

    $(BOARD_PRODUCTIMAGE_FILE_SYSTEM_TYPE) \

    $(BOARD_PRODUCTIMAGE_FILE_SYSTEM_TYPE) \
@@ -1912,6 +1916,7 @@ $(if $(INTERNAL_USERIMAGES_SPARSE_F2FS_FLAG),$(hide) echo "f2fs_sparse_flag=$(IN 
$(if $(BOARD_EROFS_COMPRESSOR),$(hide) echo "erofs_default_compressor=$(BOARD_EROFS_COMPRESSOR)" >> $(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_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_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))

$(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_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))

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

tools/releasetools/build_image.py

+4 −0
Original line number Original line Diff line number Diff line
@@ -348,6 +348,8 @@ def BuildImageMkfs(in_dir, prop_dict, out_file, target_out, fs_config): 
      build_command.extend(["-C", prop_dict["erofs_pcluster_size"]])

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

    if "erofs_share_dup_blocks" in prop_dict:

    if "erofs_share_dup_blocks" in prop_dict:

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

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

    if "erofs_use_legacy_compression" in prop_dict:

      build_command.extend(["-E", "legacy-compress"])





    build_command.extend([out_file, in_dir])

    build_command.extend([out_file, in_dir])

    if "erofs_sparse_flag" in prop_dict and not disable_sparse:

    if "erofs_sparse_flag" in prop_dict and not disable_sparse:
@@ -653,6 +655,7 @@ def ImagePropFromGlobalDict(glob_dict, mount_point): 
      "erofs_pcluster_size",

      "erofs_pcluster_size",

      "erofs_share_dup_blocks",

      "erofs_share_dup_blocks",

      "erofs_sparse_flag",

      "erofs_sparse_flag",

      "erofs_use_legacy_compression",

      "squashfs_sparse_flag",

      "squashfs_sparse_flag",

      "system_f2fs_compress",

      "system_f2fs_compress",

      "system_f2fs_sldc_flags",

      "system_f2fs_sldc_flags",
@@ -698,6 +701,7 @@ def ImagePropFromGlobalDict(glob_dict, mount_point): 
      (True, "avb_{}_hashtree_enable", "avb_hashtree_enable"),

      (True, "avb_{}_hashtree_enable", "avb_hashtree_enable"),

      (True, "avb_{}_key_path", "avb_key_path"),

      (True, "avb_{}_key_path", "avb_key_path"),

      (True, "avb_{}_salt", "avb_salt"),

      (True, "avb_{}_salt", "avb_salt"),

      (True, "erofs_use_legacy_compression", "erofs_use_legacy_compression"),

      (True, "ext4_share_dup_blocks", "ext4_share_dup_blocks"),

      (True, "ext4_share_dup_blocks", "ext4_share_dup_blocks"),

      (True, "{}_base_fs_file", "base_fs_file"),

      (True, "{}_base_fs_file", "base_fs_file"),

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

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