diff options
| author | Jin Qian <jinqian@google.com> | 2017-06-26 19:34:49 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-06-26 19:34:49 +0000 |
| commit | ddfeb748453594d15fbd5176f68f7ca724f358eb (patch) | |
| tree | bbc077733c01864c40c35620c9a156fbe822c840 /f2fs_utils | |
| parent | 8f573923b2ca7254497298cc97e2c4664af43387 (diff) | |
| parent | 0d864d37048368a46eb5e244a6b6ecabde26679e (diff) | |
| download | extras-ddfeb748453594d15fbd5176f68f7ca724f358eb.tar.gz | |
Merge "use f2fs upstream host to generate image" am: 6a9444152f am: 7c17f07be9
am: 0d864d3704
Change-Id: I77e49ee0558a31f2bdc314faa628231a8f95e870
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 |