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

Commit 37700c9a authored by Simon Wilson's avatar Simon Wilson Committed by Gerrit Code Review
Browse files

Merge "Add compressor options for squashfs system images"

parents 4ac8e059 011ea06d

core/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -705,6 +705,8 @@ $(if $(BOARD_SYSTEMIMAGE_PARTITION_SIZE),$(hide) echo "system_size=$(BOARD_SYSTE 
$(if $(BOARD_SYSTEMIMAGE_FILE_SYSTEM_TYPE),$(hide) echo "system_fs_type=$(BOARD_SYSTEMIMAGE_FILE_SYSTEM_TYPE)" >> $(1))

$(if $(BOARD_SYSTEMIMAGE_JOURNAL_SIZE),$(hide) echo "system_journal_size=$(BOARD_SYSTEMIMAGE_JOURNAL_SIZE)" >> $(1))

$(if $(BOARD_HAS_EXT4_RESERVED_BLOCKS),$(hide) echo "has_ext4_reserved_blocks=$(BOARD_HAS_EXT4_RESERVED_BLOCKS)" >> $(1))

$(if $(BOARD_SYSTEMIMAGE_SQUASHFS_COMPRESSOR),$(hide) echo "system_squashfs_compressor=$(BOARD_SYSTEMIMAGE_SQUASHFS_COMPRESSOR)" >> $(1))

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

tools/releasetools/build_image.py

+6 −0
Original line number Diff line number Diff line
@@ -275,6 +275,10 @@ def BuildImage(in_dir, prop_dict, out_file): 
    build_command.extend(["-m", prop_dict["mount_point"]])

    if "selinux_fc" in prop_dict:

      build_command.extend(["-c", prop_dict["selinux_fc"]])

    if "squashfs_compressor" in prop_dict:

      build_command.extend(["-z", prop_dict["squashfs_compressor"]])

    if "squashfs_compressor_opt" in prop_dict:

      build_command.extend(["-zo", prop_dict["squashfs_compressor_opt"]])

  elif fs_type.startswith("f2fs"):

    build_command = ["mkf2fsuserimg.sh"]

    build_command.extend([out_file, prop_dict["partition_size"]])
@@ -415,6 +419,8 @@ def ImagePropFromGlobalDict(glob_dict, mount_point): 
    copy_prop("ramdisk_dir", "ramdisk_dir")

    copy_prop("ramdisk_fs_config", "ramdisk_fs_config")

    copy_prop("has_ext4_reserved_blocks", "has_ext4_reserved_blocks")

    copy_prop("system_squashfs_compressor", "squashfs_compressor")

    copy_prop("system_squashfs_compressor_opt", "squashfs_compressor_opt")

  elif mount_point == "data":

    # Copy the generic fs type first, override with specific one if available.

    copy_prop("fs_type", "fs_type")