Merge remote-tracking branch 'cm/cm-14.0' into cm-14.0-x86

[android-x86/system-extras.git] / f2fs_utils / Android.mk

diff --git a/f2fs_utils/Android.mk b/f2fs_utils/Android.mk
index 647c390..e6606a3 100644 (file)
--- a/f2fs_utils/Android.mk
+++ b/f2fs_utils/Android.mk
@@ -2,7 +2,7 @@
 
 LOCAL_PATH:= $(call my-dir)
 
-ifeq ($(HOST_OS),linux)
+ifneq (,$(filter linux darwin,$(HOST_OS)))
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := libf2fs_utils_host
@@ -41,7 +41,7 @@ LOCAL_MODULE := make_f2fs
 LOCAL_LDFLAGS := -ldl -rdynamic
 # The following libf2fs_* are from system/extras/f2fs_utils,
 # and do not use code in external/f2fs-tools.
-LOCAL_STATIC_LIBRARIES := libf2fs_utils_host libf2fs_ioutils_host libf2fs_dlutils_host
+LOCAL_STATIC_LIBRARIES := libf2fs_utils_host libf2fs_dlutils_host
 LOCAL_REQUIRED_MODULES := libf2fs_fmt_host_dyn
 LOCAL_STATIC_LIBRARIES += \
     libsparse_host \
@@ -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