From 2ea1eba98c42a991528c66dc24daae0309a38150 Mon Sep 17 00:00:00 2001
From: Jaegeuk Kim <jaegeuk@google.com>
Date: Tue, 28 Nov 2017 19:21:28 -0800
Subject: [PATCH] core, release: add sload.f2fs for otatools.zip
This also updates mkf2fsuserimg.sh to call sload.f2fs.
Change-Id: I245f6b3dfcd966fbc6783329d781375879fcd065
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
---
core/Makefile | 1 +
tools/releasetools/build_image.py | 11 +++++++++++
2 files changed, 12 insertions(+)
diff --git a/core/Makefile b/core/Makefile
index 2ff5accf0..6a1f000e9 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -2139,6 +2139,7 @@ OTATOOLS := $(HOST_OUT_EXECUTABLES)/minigzip \
$(HOST_OUT_EXECUTABLES)/mksquashfs \
$(HOST_OUT_EXECUTABLES)/mkf2fsuserimg.sh \
$(HOST_OUT_EXECUTABLES)/make_f2fs \
+ $(HOST_OUT_EXECUTABLES)/sload_f2fs \
$(HOST_OUT_EXECUTABLES)/simg2img \
$(HOST_OUT_EXECUTABLES)/e2fsck \
$(HOST_OUT_EXECUTABLES)/build_verity_tree \
diff --git a/tools/releasetools/build_image.py b/tools/releasetools/build_image.py
index e11f5a63f..62a540968 100755
--- a/tools/releasetools/build_image.py
+++ b/tools/releasetools/build_image.py
@@ -517,6 +517,17 @@ def BuildImage(in_dir, prop_dict, out_file, target_out=None):
elif fs_type.startswith("f2fs"):
build_command = ["mkf2fsuserimg.sh"]
build_command.extend([out_file, prop_dict["partition_size"]])
+ if fs_config:
+ build_command.extend(["-C", fs_config])
+ build_command.extend(["-f", in_dir])
+ if target_out:
+ build_command.extend(["-D", target_out])
+ if "selinux_fc" in prop_dict:
+ build_command.extend(["-s", prop_dict["selinux_fc"]])
+ build_command.extend(["-t", prop_dict["mount_point"]])
+ if "timestamp" in prop_dict:
+ build_command.extend(["-T", str(prop_dict["timestamp"])])
+ build_command.extend(["-L", prop_dict["mount_point"]])
else:
print("Error: unknown filesystem type '%s'" % (fs_type))
return False