Link libfuse-lite from ntfs-3g

diff --git a/Android.mk b/Android.mk
index 02da09f..d048c90 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -9,9 +9,8 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := mount.exfat
 LOCAL_MODULE_TAGS := optional
 LOCAL_SRC_FILES := main.c
-LOCAL_SHARED_LIBRARIES += libz libc
-LOCAL_STATIC_LIBRARIES += libexfat_mount libexfat_fsck libexfat_mkfs
-LOCAL_STATIC_LIBRARIES += libexfat libfuse
+LOCAL_SHARED_LIBRARIES := libfuse-lite
+LOCAL_STATIC_LIBRARIES := libexfat_mount libexfat_fsck libexfat_mkfs libexfat
 include $(BUILD_EXECUTABLE)
 
 SYMLINKS := $(addprefix $(TARGET_OUT)/bin/,$(LINKS))
@@ -47,7 +46,7 @@ $(RECOVERY_SYMLINKS): $(LOCAL_INSTALLED_MODULE) $(LOCAL_PATH)/Android.mk
        @rm -rf $@
        $(hide) ln -sf $(EXFAT_BINARY) $@
 
-ALL_DEFAULT_INSTALLED_MODULES += $(RECOVERY_SYMLINKS)
+$(PRODUCT_OUT)/recovery.img: $(RECOVERY_SYMLINKS)
 
 
 include $(FUSE_ROOT)/libexfat/Android.mk

diff --git a/fsck/Android.mk b/fsck/Android.mk
index 1c46dfc..ddc4360 100644 (file)
--- a/fsck/Android.mk
+++ b/fsck/Android.mk
@@ -8,6 +8,6 @@ LOCAL_CFLAGS = -D_FILE_OFFSET_BITS=64
 LOCAL_SRC_FILES =  main.c
 LOCAL_C_INCLUDES += $(LOCAL_PATH) \
                                        external/exfat/libexfat \
-                                       external/fuse/include
+                                       external/ntfs-3g/include/fuse-lite
 include $(BUILD_STATIC_LIBRARY)
 

diff --git a/fuse/Android.mk b/fuse/Android.mk
index 7f53b46..eb645af 100644 (file)
--- a/fuse/Android.mk
+++ b/fuse/Android.mk
@@ -7,6 +7,5 @@ LOCAL_CFLAGS = -D_FILE_OFFSET_BITS=64
 LOCAL_SRC_FILES = main.c 
 LOCAL_C_INCLUDES += $(LOCAL_PATH) \
                                        external/exfat/libexfat \
-                                       external/fuse/include \
-                                       external/fuse/android
+                                       external/ntfs-3g/include/fuse-lite
 include $(BUILD_STATIC_LIBRARY)

diff --git a/mkfs/Android.mk b/mkfs/Android.mk
index ead8ba2..f78f860 100644 (file)
--- a/mkfs/Android.mk
+++ b/mkfs/Android.mk
@@ -7,5 +7,5 @@ LOCAL_CFLAGS = -D_FILE_OFFSET_BITS=64
 LOCAL_SRC_FILES =  cbm.c fat.c main.c mkexfat.c rootdir.c uct.c uctc.c vbr.c
 LOCAL_C_INCLUDES += $(LOCAL_PATH) \
                                        external/exfat/libexfat \
-                                       external/fuse/include
+                                       external/ntfs-3g/include/fuse-lite
 include $(BUILD_STATIC_LIBRARY)