From df09c8ba1df8aeda837d944f90a41e0ffa066275 Mon Sep 17 00:00:00 2001 From: Dees_Troy Date: Tue, 6 Aug 2013 18:00:13 +0000 Subject: Rename libfuse to prevent conflicts with newer CM trees Change-Id: I468e8556e1606b9c944292db27237026e78fb8f0 --- exfat/exfat-fuse/Android.mk | 2 +- exfat/mkfs/Android.mk | 2 +- fuse/Android.mk | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/exfat/exfat-fuse/Android.mk b/exfat/exfat-fuse/Android.mk index 96278352f..f6ec20a85 100644 --- a/exfat/exfat-fuse/Android.mk +++ b/exfat/exfat-fuse/Android.mk @@ -12,7 +12,7 @@ LOCAL_C_INCLUDES += $(LOCAL_PATH) \ bootable/recovery/exfat/libexfat \ bootable/recovery/fuse/include LOCAL_SHARED_LIBRARIES += libz libc libexfat libdl -LOCAL_STATIC_LIBRARIES += libfuse +LOCAL_STATIC_LIBRARIES += libfusetwrp include $(BUILD_EXECUTABLE) diff --git a/exfat/mkfs/Android.mk b/exfat/mkfs/Android.mk index bccd7c9ac..8c48c77cb 100644 --- a/exfat/mkfs/Android.mk +++ b/exfat/mkfs/Android.mk @@ -11,7 +11,7 @@ LOCAL_C_INCLUDES += $(LOCAL_PATH) \ bootable/recovery/exfat/libexfat \ bootable/recovery/fuse/include LOCAL_SHARED_LIBRARIES += libz libc libexfat libdl -LOCAL_STATIC_LIBRARIES += libfuse +LOCAL_STATIC_LIBRARIES += libfusetwrp include $(BUILD_EXECUTABLE) diff --git a/fuse/Android.mk b/fuse/Android.mk index 59cd9b3ae..3bd16161f 100644 --- a/fuse/Android.mk +++ b/fuse/Android.mk @@ -42,7 +42,7 @@ LOCAL_CFLAGS := \ -D_FILE_OFFSET_BITS=64 \ -DFUSE_USE_VERSION=26 -LOCAL_MODULE := libfuse +LOCAL_MODULE := libfusetwrp LOCAL_MODULE_TAGS := optional include $(BUILD_STATIC_LIBRARY) @@ -61,6 +61,6 @@ LOCAL_CFLAGS := -D_FILE_OFFSET_BITS=64 LOCAL_MODULE := fusexmp LOCAL_MODULE_TAGS := optional -LOCAL_STATIC_LIBRARIES := libfuse +LOCAL_STATIC_LIBRARIES := libfusetwrp include $(BUILD_EXECUTABLE) -- cgit v1.2.3