PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Rename libfuse to prevent conflicts with newer CM trees" into twrp2.5

Browse Source
This commit is contained in:
Dees_Troy
2013-08-11 08:32:26 -05:00
committed by Gerrit Code Review
parent d5f2b7a4d3 df09c8ba1d
commit 52b77182d0
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
exfat/exfat-fuse/Android.mk
+1 -1
View File
@@ -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)
exfat/mkfs/Android.mk
+1 -1
View File
@@ -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)
fuse/Android.mk
+2 -2
View File
@@ -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)