summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDees_Troy <dees_troy@teamw.in>2013-08-11 15:32:26 +0200
committerGerrit Code Review <gerrit@198.50.184.117>2013-08-11 15:32:26 +0200
commit52b77182d03071bd52e136810f3f46f08cd19501 (patch)
treeecff629d5510ab467741f87b6d43e00e3a4d347a
parentMerge "Fix permissions on backup files" into twrp2.5 (diff)
parentRename libfuse to prevent conflicts with newer CM trees (diff)
downloadandroid_bootable_recovery-52b77182d03071bd52e136810f3f46f08cd19501.tar
android_bootable_recovery-52b77182d03071bd52e136810f3f46f08cd19501.tar.gz
android_bootable_recovery-52b77182d03071bd52e136810f3f46f08cd19501.tar.bz2
android_bootable_recovery-52b77182d03071bd52e136810f3f46f08cd19501.tar.lz
android_bootable_recovery-52b77182d03071bd52e136810f3f46f08cd19501.tar.xz
android_bootable_recovery-52b77182d03071bd52e136810f3f46f08cd19501.tar.zst
android_bootable_recovery-52b77182d03071bd52e136810f3f46f08cd19501.zip
-rw-r--r--exfat/exfat-fuse/Android.mk2
-rw-r--r--exfat/mkfs/Android.mk2
-rw-r--r--fuse/Android.mk4
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)