diff options
| author | Yang Jin <yajin@google.com> | 2017-06-22 11:20:51 -0700 |
|---|---|---|
| committer | Jin Qian <jinqian@google.com> | 2017-06-26 17:51:10 +0000 |
| commit | 7bc878555709e9e744e8a44ca476d370403b58ab (patch) | |
| tree | 42ae3cf65d786caf75b15ee5fe687999d895a8ff /f2fs_utils | |
| parent | 7c8b89acad114922ef35930f7eff50046cd09359 (diff) | |
| download | extras-7bc878555709e9e744e8a44ca476d370403b58ab.tar.gz | |
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
Diffstat (limited to 'f2fs_utils')
| -rw-r--r-- | f2fs_utils/Android.bp | 33 | ||||
| -rwxr-xr-x | f2fs_utils/mkf2fsuserimg.sh | 2 |
2 files changed, 1 insertions, 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 |