Add support for creating ext4 images with mke2fs
We are investigating replacing make_ext4fs with the upstream tool mke2fs.
To mitigate the trouble that may arise if the new tool behave differently
compared to the old one, there will be a transition period.
Devices that want to use the new way of creating ext4 images can set the
variable "TARGET_USES_MKE2FS" to true in their BoardConfig.mk
By default, the build system will choose the old tool 'make_ext4fs'.
Test: m otapackage with TARGET_USES_MKE2FS={,false,true}
Change-Id: I282bcb9efe335a86c53986283090ca947d65c7f8
diff --git a/tools/releasetools/build_image.py b/tools/releasetools/build_image.py
index 6bf42d1..c5be3df 100755
--- a/tools/releasetools/build_image.py
+++ b/tools/releasetools/build_image.py
@@ -437,7 +437,7 @@
prop_dict["original_partition_size"] = str(partition_size)
if fs_type.startswith("ext"):
- build_command = ["mkuserimg.sh"]
+ build_command = [prop_dict["ext_mkuserimg"]]
if "extfs_sparse_flag" in prop_dict:
build_command.append(prop_dict["extfs_sparse_flag"])
run_fsck = True
@@ -606,6 +606,7 @@
"squashfs_sparse_flag",
"selinux_fc",
"skip_fsck",
+ "ext_mkuserimg",
"verity",
"verity_key",
"verity_signer_cmd",