Rename libexfat target to prevent conflicts
Change-Id: I5d2774c273a90c1f02c074f3c947c13b265972b3
diff --git a/exfat/exfat-fuse/Android.mk b/exfat/exfat-fuse/Android.mk
index 251e087..ff5ef3e 100644
--- a/exfat/exfat-fuse/Android.mk
+++ b/exfat/exfat-fuse/Android.mk
@@ -11,7 +11,7 @@
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 39a7faa..a280abb 100644
--- a/exfat/libexfat/Android.mk
+++ b/exfat/libexfat/Android.mk
@@ -2,7 +2,7 @@
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 a0c601f..2cae2c8 100644
--- a/exfat/mkfs/Android.mk
+++ b/exfat/mkfs/Android.mk
@@ -10,7 +10,7 @@
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 668dacf..036d602 100644
--- a/prebuilt/Android.mk
+++ b/prebuilt/Android.mk
@@ -128,7 +128,7 @@
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