commit 91238cce14dc9f1e0bdfb25f3e37e536f8d8b998
author Alistair Delva <adelva@google.com> Wed Oct 16 10:53:41 2019 -0700
committer Alistair Delva <adelva@google.com> Fri Nov 15 19:05:41 2019 +0000
tree ee8b398afae7d11da03029e2a496470a4db393c3
parent 371e3c3b6cb9ed18aae3fcfd6c4d67494f404c51

Allow f2fs sparse mode to be disabled

Bug: 142424832
Bug: 142803849
Change-Id: Ic112128f15e3f29208332afceea4fbc3fca40b36

tools/releasetools/build_image.py

diff --git a/tools/releasetools/build_image.py b/tools/releasetools/build_image.py
index af508fe..317a6d9 100755
--- a/tools/releasetools/build_image.py
+++ b/tools/releasetools/build_image.py
@@ -315,6 +315,8 @@
   elif fs_type.startswith("f2fs"):
     build_command = ["mkf2fsuserimg.sh"]
     build_command.extend([out_file, prop_dict["image_size"]])
+    if "f2fs_sparse_flag" in prop_dict:
+      build_command.extend([prop_dict["f2fs_sparse_flag"]])
     if fs_config:
       build_command.extend(["-C", fs_config])
     build_command.extend(["-f", in_dir])
@@ -519,6 +521,7 @@
   common_props = (
       "extfs_sparse_flag",
       "squashfs_sparse_flag",
+      "f2fs_sparse_flag",
       "skip_fsck",
       "ext_mkuserimg",
       "verity",