StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolved conflicts for merge of ecfc97f7 to mnc-dev

Browse Source 
Change-Id: Ic7661c4176dc87cb2796f9cbb61bdd64f89cdc01
This commit is contained in:
Simon Wilson
2015-06-24 16:06:34 -07:00
parent 4826dee78d ecfc97f772
commit 6d5ddc32ab
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tools/releasetools/build_image.py
View File

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