From b39e6c6047e500fc38a92e6114fdd673d87042c1 Mon Sep 17 00:00:00 2001 From: Greg Wallace Date: Tue, 29 Dec 2015 00:55:26 -0500 Subject: ntfs-3g: Fix cm-13 compatibility CM-13 tree completely changes the names of the binaries that are created for ntfs-3g. If we are using a CM-13 tree (CM SDK 4) make sure the dependencies and relinking are adjusted accordingly. Also, adapt partition code so it can make use of whichever set of binaries are present. Change-Id: I810caafa818f18281fd29dcf8f31b3053133b5ed --- prebuilt/Android.mk | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'prebuilt') diff --git a/prebuilt/Android.mk b/prebuilt/Android.mk index 068367c83..df14bbdac 100644 --- a/prebuilt/Android.mk +++ b/prebuilt/Android.mk @@ -189,10 +189,18 @@ ifneq ($(wildcard external/pcre/Android.mk),) RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libpcre.so endif ifeq ($(TW_INCLUDE_NTFS_3G),true) +ifeq ($(shell test $(CM_PLATFORM_SDK_VERSION) -ge 4; echo $$?),0) + RELINK_SOURCE_FILES += $(TARGET_OUT_EXECUTABLES)/mount.ntfs + RELINK_SOURCE_FILES += $(TARGET_OUT_EXECUTABLES)/fsck.ntfs + RELINK_SOURCE_FILES += $(TARGET_OUT_EXECUTABLES)/mkfs.ntfs + RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libntfs-3g.so + RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libfuse.so +else RELINK_SOURCE_FILES += $(TARGET_OUT_EXECUTABLES)/ntfs-3g RELINK_SOURCE_FILES += $(TARGET_OUT_EXECUTABLES)/ntfsfix RELINK_SOURCE_FILES += $(TARGET_OUT_EXECUTABLES)/mkntfs endif +endif TWRP_AUTOGEN := $(intermediates)/teamwin -- cgit v1.2.3