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

resolved conflicts for merge of fc759204 to stage-aosp-master

Browse Source 
Change-Id: Icf58e881286a66cb3ca4cb122fa8c11ec217fbab
This commit is contained in:
Mohamad Ayyash
2015-03-04 15:43:45 -08:00
parent a10263ed1f fc759204d6
commit 9b19382f0e
4 changed files with 24 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tools/releasetools/build_image.py
View File

@@ -253,6 +253,14 @@ def BuildImage(in_dir, prop_dict, out_file,
build_command.append(fc_config)
elif "selinux_fc" in prop_dict:
build_command.append(prop_dict["selinux_fc"])
elif fs_type.startswith("squash"):
build_command = ["mksquashfsimage.sh"]
build_command.extend([in_dir, out_file])
build_command.extend(["-m", prop_dict["mount_point"]])
if fc_config is not None:
build_command.extend(["-c", fc_config])
elif "selinux_fc" in prop_dict:
build_command.extend(["-c", prop_dict["selinux_fc"]])
elif fs_type.startswith("f2fs"):
build_command = ["mkf2fsuserimg.sh"]
build_command.extend([out_file, prop_dict["partition_size"]])
@@ -321,6 +329,8 @@ def ImagePropFromGlobalDict(glob_dict, mount_point):
d["mount_point"] = mount_point
if mount_point == "system":
copy_prop("fs_type", "fs_type")
# Copy the generic sysetem fs type first, override with specific one if available.
copy_prop("system_fs_type", "fs_type")
copy_prop("system_size", "partition_size")
copy_prop("system_journal_size", "journal_size")
copy_prop("system_verity_block_device", "verity_block_device")