commit b39e6c6047e500fc38a92e6114fdd673d87042c1
author Greg Wallace <greg@gregtwallace.com> Tue Dec 29 00:55:26 2015 -0500
committer Ethan Yonker <dees_troy@teamw.in> Mon Jan 04 07:25:24 2016 -0600
tree 6b686a37fafdfcdf750b73ede07fd63aa354b32b
parent 94b06502b2dc58df91151664fc00679172cb2084

ntfs-3g: Fix cm-13 compatibility

CM-13 tree completely changes the names of the binaries that are created
for ntfs-3g.  If we are using a CM-13 tree (CM SDK 4) make sure the
dependencies and relinking are adjusted accordingly.

Also, adapt partition code so it can make use of whichever set of
binaries are present.

Change-Id: I810caafa818f18281fd29dcf8f31b3053133b5ed

Android.mk

diff --git a/Android.mk b/Android.mk
index 3e0c97b..4414973 100644
--- a/Android.mk
+++ b/Android.mk
@@ -413,11 +413,18 @@
 LOCAL_CFLAGS += -DTWRES=\"$(TWRES_PATH)\"
 LOCAL_CFLAGS += -DTWHTCD_PATH=\"$(TWHTCD_PATH)\"
 ifeq ($(TW_INCLUDE_NTFS_3G),true)
+ifeq ($(shell test $(CM_PLATFORM_SDK_VERSION) -ge 4; echo $$?),0)
+    LOCAL_ADDITIONAL_DEPENDENCIES += \
+        mount.ntfs \
+        fsck.ntfs \
+        mkfs.ntfs
+else
     LOCAL_ADDITIONAL_DEPENDENCIES += \
         ntfs-3g \
         ntfsfix \
         mkntfs
 endif
+endif
 ifeq ($(TARGET_USERIMAGES_USE_F2FS), true)
 ifeq ($(shell test $(CM_PLATFORM_SDK_VERSION) -ge 3; echo $$?),0)
     LOCAL_ADDITIONAL_DEPENDENCIES += \