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

Commit cf4f7eac authored by Connor O'Brien's avatar Connor O'Brien Committed by Gerrit Code Review
Browse files

Merge "Pass flash erase & logical block size to mke2fs"

parents 4a0b494e 20f08c3e

core/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -849,6 +849,8 @@ $(if $(BOARD_SYSTEMIMAGE_SQUASHFS_DISABLE_4K_ALIGN),$(hide) echo "system_squashf 
$(if $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SYSTEM_BASE_FS_PATH),$(hide) echo "system_base_fs_file=$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SYSTEM_BASE_FS_PATH)" >> $(1))

$(if $(BOARD_USERDATAIMAGE_FILE_SYSTEM_TYPE),$(hide) echo "userdata_fs_type=$(BOARD_USERDATAIMAGE_FILE_SYSTEM_TYPE)" >> $(1))

$(if $(BOARD_USERDATAIMAGE_PARTITION_SIZE),$(hide) echo "userdata_size=$(BOARD_USERDATAIMAGE_PARTITION_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_CACHEIMAGE_FILE_SYSTEM_TYPE),$(hide) echo "cache_fs_type=$(BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE)" >> $(1))

$(if $(BOARD_CACHEIMAGE_PARTITION_SIZE),$(hide) echo "cache_size=$(BOARD_CACHEIMAGE_PARTITION_SIZE)" >> $(1))

$(if $(BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE),$(hide) echo "vendor_fs_type=$(BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE)" >> $(1))

tools/releasetools/build_image.py

+6 −0
Original line number Diff line number Diff line
@@ -462,6 +462,10 @@ def BuildImage(in_dir, prop_dict, out_file, target_out=None): 
    build_command.extend(["-L", prop_dict["mount_point"]])

    if "extfs_inode_count" in prop_dict:

      build_command.extend(["-i", prop_dict["extfs_inode_count"]])

    if "flash_erase_block_size" in prop_dict:

      build_command.extend(["-e", prop_dict["flash_erase_block_size"]])

    if "flash_logical_block_size" in prop_dict:

      build_command.extend(["-o", prop_dict["flash_logical_block_size"]])

    if "selinux_fc" in prop_dict:

      build_command.append(prop_dict["selinux_fc"])

  elif fs_type.startswith("squash"):
@@ -665,6 +669,8 @@ def ImagePropFromGlobalDict(glob_dict, mount_point): 
    copy_prop("fs_type", "fs_type")

    copy_prop("userdata_fs_type", "fs_type")

    copy_prop("userdata_size", "partition_size")

    copy_prop("flash_logical_block_size","flash_logical_block_size")

    copy_prop("flash_erase_block_size", "flash_erase_block_size")

  elif mount_point == "cache":

    copy_prop("cache_fs_type", "fs_type")

    copy_prop("cache_size", "partition_size")