summaryrefslogtreecommitdiff
authorBaocheng Sun <baocheng.sun@amlogic.com>2017-10-23 02:55:17 (GMT)
committer Baocheng Sun <baocheng.sun@amlogic.com>2017-10-24 03:25:25 (GMT)
commit2b8856b245eb72372053501ab73e6d0aab1953b2 (patch)
treee81552488fe06b54c7faa23578d73e160aa5f97f
parent178b7fc63dd6534c0a55963b5f179ec11e829089 (diff)
downloaddroidvold-2b8856b245eb72372053501ab73e6d0aab1953b2.zip
droidvold-2b8856b245eb72372053501ab73e6d0aab1953b2.tar.gz
droidvold-2b8856b245eb72372053501ab73e6d0aab1953b2.tar.bz2
droidvold: switch ntfs kernel support to ntfs-3g fuse [3/3]
PD# 152130 switch ntfs kernel support to ntfs-3g fuse Change-Id: I8fb9a98d3d6354f0b1a642b5f43871796e5a2875
Diffstat
-rw-r--r--Android.mk1
-rw-r--r--fs/Ntfs.cpp6
2 files changed, 4 insertions, 3 deletions
diff --git a/Android.mk b/Android.mk
index b801242..214b78c 100644
--- a/Android.mk
+++ b/Android.mk
@@ -49,6 +49,7 @@ LOCAL_INIT_RC := droidvold.rc
LOCAL_C_INCLUDES := $(common_c_includes)
LOCAL_CFLAGS := $(vold_cflags)
+LOCAL_CFLAGS += -DHAS_NTFS_3G
LOCAL_CONLYFLAGS := $(vold_conlyflags)
LOCAL_SHARED_LIBRARIES := $(common_shared_libraries)
diff --git a/fs/Ntfs.cpp b/fs/Ntfs.cpp
index 7c5a04d..7571e34 100644
--- a/fs/Ntfs.cpp
+++ b/fs/Ntfs.cpp
@@ -45,9 +45,9 @@
#define UNUSED __attribute__((unused))
#ifdef HAS_NTFS_3G
-static char NTFS_3G_PATH[] = "/system/bin/ntfs-3g";
-static char NTFSFIX_3G_PATH[] = "/system/bin/ntfsfix";
-static char MKNTFS_3G_PATH[] = "/system/bin/mkntfs";
+static char NTFS_3G_PATH[] = "/vendor/bin/ntfs-3g";
+static char NTFSFIX_3G_PATH[] = "/vendor/bin/ntfsfix";
+static char MKNTFS_3G_PATH[] = "/vendor/bin/mkntfs";
#endif /* HAS_NTFS_3G */
extern "C" int mount(