From 6a1acf2ce4c522d51296b1cd1beced53b4da97df Mon Sep 17 00:00:00 2001
From: Captain Throwback <captainthrowback@hotmail.com>
Date: Thu, 18 Sep 2014 12:46:35 -0400
Subject: Fixes for exfat-fuse

Change-Id: I46a1e7bf115c45616774b0571b17e38777ba87f8
---
 Android.mk          | 6 ++++--
 prebuilt/Android.mk | 5 ++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/Android.mk b/Android.mk
index 3d95c840c..10dc79fd7 100644
--- a/Android.mk
+++ b/Android.mk
@@ -416,11 +416,13 @@ ifeq ($(BUILD_ID), GINGERBREAD)
     TW_NO_EXFAT := true
 endif
 ifneq ($(TW_NO_EXFAT), true)
-    include $(commands_recovery_local_path)/exfat/exfat-fuse/Android.mk \
-            $(commands_recovery_local_path)/exfat/mkfs/Android.mk \
+    include $(commands_recovery_local_path)/exfat/mkfs/Android.mk \
             $(commands_recovery_local_path)/fuse/Android.mk \
             $(commands_recovery_local_path)/exfat/libexfat/Android.mk
 endif
+ifneq ($(TW_NO_EXFAT_FUSE), true)
+    include $(commands_recovery_local_path)/exfat/exfat-fuse/Android.mk
+endif
 ifeq ($(TW_INCLUDE_CRYPTO), true)
     include $(commands_recovery_local_path)/crypto/ics/Android.mk
 endif
diff --git a/prebuilt/Android.mk b/prebuilt/Android.mk
index 9431c945e..dc97e9118 100644
--- a/prebuilt/Android.mk
+++ b/prebuilt/Android.mk
@@ -79,9 +79,12 @@ ifeq ($(BUILD_ID), GINGERBREAD)
     TW_NO_EXFAT := true
 endif
 ifneq ($(TW_NO_EXFAT), true)
-    RELINK_SOURCE_FILES += $(TARGET_RECOVERY_ROOT_OUT)/sbin/exfat-fuse
     RELINK_SOURCE_FILES += $(TARGET_RECOVERY_ROOT_OUT)/sbin/mkexfatfs
     RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libexfat.so
+    TW_NO_EXFAT_FUSE := true
+endif
+ifneq ($(TW_NO_EXFAT_FUSE), true)
+    RELINK_SOURCE_FILES += $(TARGET_RECOVERY_ROOT_OUT)/sbin/exfat-fuse
 endif
 ifeq ($(TW_INCLUDE_BLOBPACK), true)
     RELINK_SOURCE_FILES += $(TARGET_RECOVERY_ROOT_OUT)/sbin/blobpack
-- 
cgit v1.2.3