core+tools: support specifying F2FS as the fstype for userdata
- Support TARGET_USERIMAGES_USE_F2FS. - Support BOARD_USERDATAIMAGE_FILE_SYSTEM_TYPE. - Support "userdata_fs_type" in the prop dict. - Update build_image to recognize f2fs and call the correct command. Change-Id: If31cc8bd235f93a4c7814fab36e6e2d13d3037ad Signed-off-by: JP Abgrall <jpa@google.com>
This commit is contained in:
@@ -256,6 +256,9 @@ 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("f2fs"):
|
||||
build_command = ["mkf2fsuserimg.sh"]
|
||||
build_command.extend([out_file, prop_dict["partition_size"]])
|
||||
else:
|
||||
build_command = ["mkyaffs2image", "-f"]
|
||||
if prop_dict.get("mkyaffs2_extra_flags", None):
|
||||
@@ -325,7 +328,9 @@ def ImagePropFromGlobalDict(glob_dict, mount_point):
|
||||
copy_prop("fs_type", "fs_type")
|
||||
copy_prop("system_size", "partition_size")
|
||||
elif mount_point == "data":
|
||||
# Copy the generic fs type first, override with specific one if available.
|
||||
copy_prop("fs_type", "fs_type")
|
||||
copy_prop("userdata_fs_type", "fs_type")
|
||||
copy_prop("userdata_size", "partition_size")
|
||||
elif mount_point == "cache":
|
||||
copy_prop("cache_fs_type", "fs_type")
|
||||
|
Reference in New Issue
Block a user