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

Commit 6d5ddc32 authored by Simon Wilson's avatar Simon Wilson
Browse files

resolved conflicts for merge of ecfc97f7 to mnc-dev 

Change-Id: Ic7661c4176dc87cb2796f9cbb61bdd64f89cdc01
parents 4826dee7 ecfc97f7

core/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -735,6 +735,8 @@ $(if $(BOARD_SYSTEMIMAGE_FILE_SYSTEM_TYPE),$(hide) echo "system_fs_type=$(BOARD_ 
$(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_FLASH_BLOCK_SIZE),$(hide) echo "blocksize=$(BOARD_FLASH_BLOCK_SIZE)" >> $(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
@@ -296,6 +296,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"]])
@@ -404,6 +408,8 @@ def ImagePropFromGlobalDict(glob_dict, mount_point): 
    copy_prop("ramdisk_dir", "ramdisk_dir")

    copy_prop("has_ext4_reserved_blocks", "has_ext4_reserved_blocks")

    copy_prop("blocksize", "blocksize")

    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")