From 7bc878555709e9e744e8a44ca476d370403b58ab Mon Sep 17 00:00:00 2001
From: Yang Jin <yajin@google.com>
Date: Thu, 22 Jun 2017 11:20:51 -0700
Subject: use f2fs upstream host to generate image

calls make_f2fs -S <size> <filename>

Test: ./mkf2fsuserimg.sh ~/android/userdata.img 2000000000
Bug: 62493641
Change-Id: I4d3631a631fbdfbfc680eeba5f2a1dde204cba25
Merged-In: I4d3631a631fbdfbfc680eeba5f2a1dde204cba25
---
 f2fs_utils/Android.bp       | 33 ---------------------------------
 f2fs_utils/mkf2fsuserimg.sh |  2 +-
 2 files changed, 1 insertion(+), 34 deletions(-)

diff --git a/f2fs_utils/Android.bp b/f2fs_utils/Android.bp
index afa5627c..86790c4b 100644
--- a/f2fs_utils/Android.bp
+++ b/f2fs_utils/Android.bp
@@ -69,39 +69,6 @@ cc_library_host_static {
     },
 }
 
-cc_binary_host {
-    name: "make_f2fs",
-
-    srcs: ["make_f2fs_main.c"],
-
-    // libf2fs_dlutils_host will dlopen("libf2fs_fmt_host_dyn")
-    host_ldlibs: [
-        "-ldl",
-    ],
-
-    ldflags: [
-        "-rdynamic"
-    ],
-
-    // The following libf2fs_* are from system/extras/f2fs_utils,
-    // and do not use code in external/f2fs-tools.
-    static_libs: [
-        "libf2fs_utils_host",
-        "libf2fs_ioutils_host",
-        "libf2fs_dlutils_host",
-        "libsparse",
-        "libz",
-    ],
-
-    required: ["libf2fs_fmt_host_dyn"],
-
-    target: {
-        darwin: {
-            enabled: false,
-        },
-    },
-}
-
 cc_library_shared {
     name: "libf2fs_dlutils",
 
diff --git a/f2fs_utils/mkf2fsuserimg.sh b/f2fs_utils/mkf2fsuserimg.sh
index 93ec743b..f7b6aa18 100755
--- a/f2fs_utils/mkf2fsuserimg.sh
+++ b/f2fs_utils/mkf2fsuserimg.sh
@@ -26,7 +26,7 @@ if [ -z $SIZE ]; then
   exit 2
 fi
 
-MAKE_F2FS_CMD="make_f2fs -l $SIZE $OUTPUT_FILE"
+MAKE_F2FS_CMD="make_f2fs -S $SIZE $OUTPUT_FILE"
 echo $MAKE_F2FS_CMD
 $MAKE_F2FS_CMD
 if [ $? -ne 0 ]; then
-- 
cgit v1.2.3