f2fs_utils: Add a static libf2fs_sparseblock for minvold

Change-Id: Id0947eb304cabbe59c21b8c2e2b81a03cceed619

diff --git a/f2fs_utils/Android.mk b/f2fs_utils/Android.mk
index 79cf63b..e6606a3 100644 (file)
--- a/f2fs_utils/Android.mk
+++ b/f2fs_utils/Android.mk
@@ -76,6 +76,15 @@ endif
 include $(CLEAR_VARS)
 LOCAL_MODULE := libf2fs_sparseblock
 LOCAL_SRC_FILES := f2fs_sparseblock.c
+LOCAL_CFLAGS += -DSTATIC_LIB
+LOCAL_STATIC_LIBRARIES := libcutils
+LOCAL_C_INCLUDES := external/f2fs-tools/include \
+               system/core/include/log
+include $(BUILD_STATIC_LIBRARY)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := libf2fs_sparseblock
+LOCAL_SRC_FILES := f2fs_sparseblock.c
 LOCAL_SHARED_LIBRARIES := libcutils
 LOCAL_C_INCLUDES := external/f2fs-tools/include \
                system/core/include/log

diff --git a/f2fs_utils/f2fs_sparseblock.c b/f2fs_utils/f2fs_sparseblock.c
index e39a61f..17552fb 100644 (file)
--- a/f2fs_utils/f2fs_sparseblock.c
+++ b/f2fs_utils/f2fs_sparseblock.c
@@ -588,6 +588,7 @@ int copy_used(u64 pos, void *data)
     return 0;
 }
 
+#ifndef STATIC_LIB
 int main(int argc, char **argv)
 {
     if (argc != 3)
@@ -631,3 +632,4 @@ int main(int argc, char **argv)
     close(outfd);
     return 0;
 }
+#endif