From dc3bc46a82e7a2b3594498d60482fa83f192d4c7 Mon Sep 17 00:00:00 2001
From: Ethan Yonker <dees_troy@teamw.in>
Date: Tue, 8 Dec 2015 15:12:40 -0600
Subject: Rename libexfat target to prevent conflicts

Change-Id: I5d2774c273a90c1f02c074f3c947c13b265972b3
---
 exfat/exfat-fuse/Android.mk | 2 +-
 exfat/libexfat/Android.mk   | 2 +-
 exfat/mkfs/Android.mk       | 2 +-
 prebuilt/Android.mk         | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/exfat/exfat-fuse/Android.mk b/exfat/exfat-fuse/Android.mk
index 251e087e6..ff5ef3e0d 100644
--- a/exfat/exfat-fuse/Android.mk
+++ b/exfat/exfat-fuse/Android.mk
@@ -11,7 +11,7 @@ LOCAL_SRC_FILES = main.c
 LOCAL_C_INCLUDES += $(LOCAL_PATH) \
 					$(commands_recovery_local_path)/exfat/libexfat \
 					$(commands_recovery_local_path)/fuse/include
-LOCAL_SHARED_LIBRARIES += libz libc libexfat libdl 
+LOCAL_SHARED_LIBRARIES += libz libc libexfat_twrp libdl
 LOCAL_STATIC_LIBRARIES += libfusetwrp
 
 include $(BUILD_EXECUTABLE)
diff --git a/exfat/libexfat/Android.mk b/exfat/libexfat/Android.mk
index 39a7faae7..a280abb0e 100644
--- a/exfat/libexfat/Android.mk
+++ b/exfat/libexfat/Android.mk
@@ -2,7 +2,7 @@ LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
 
-LOCAL_MODULE := libexfat
+LOCAL_MODULE := libexfat_twrp
 LOCAL_MODULE_TAGS := optional
 LOCAL_CFLAGS = -D_FILE_OFFSET_BITS=64
 LOCAL_SRC_FILES = cluster.c io.c log.c lookup.c mount.c node.c time.c utf.c utils.c 
diff --git a/exfat/mkfs/Android.mk b/exfat/mkfs/Android.mk
index a0c601f3d..2cae2c8ba 100644
--- a/exfat/mkfs/Android.mk
+++ b/exfat/mkfs/Android.mk
@@ -10,7 +10,7 @@ LOCAL_SRC_FILES =  cbm.c fat.c main.c mkexfat.c rootdir.c uct.c uctc.c vbr.c
 LOCAL_C_INCLUDES += $(LOCAL_PATH) \
 					$(commands_recovery_local_path)/exfat/libexfat \
 					$(commands_recovery_local_path)/fuse/include
-LOCAL_SHARED_LIBRARIES += libz libc libexfat libdl 
+LOCAL_SHARED_LIBRARIES += libz libc libexfat_twrp libdl
 LOCAL_STATIC_LIBRARIES += libfusetwrp
 
 include $(BUILD_EXECUTABLE)
diff --git a/prebuilt/Android.mk b/prebuilt/Android.mk
index 668dacf76..036d60267 100644
--- a/prebuilt/Android.mk
+++ b/prebuilt/Android.mk
@@ -128,7 +128,7 @@ ifeq ($(BUILD_ID), GINGERBREAD)
 endif
 ifneq ($(TW_NO_EXFAT), true)
     RELINK_SOURCE_FILES += $(TARGET_RECOVERY_ROOT_OUT)/sbin/mkexfatfs
-    RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libexfat.so
+    RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libexfat_twrp.so
 else
     TW_NO_EXFAT_FUSE := true
 endif
-- 
cgit v1.2.3