Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6c28ee83 authored by Jason Riordan's avatar Jason Riordan Committed by Dees Troy
Browse files

NTFS-3g: migrate to PLATFORM_SDK check instead 

android-6.0 branch of ntfs-3g matches the cm-13.0 version now,
check platform version instead of CM_SDK version.

Change-Id: Ic4aed613084d530c814611678f70d75260b9adc4
parent 61c7c5c6

Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -428,7 +428,7 @@ endif 
LOCAL_CFLAGS += -DTWRES=\"$(TWRES_PATH)\"

LOCAL_CFLAGS += -DTWHTCD_PATH=\"$(TWHTCD_PATH)\"

ifeq ($(TW_INCLUDE_NTFS_3G),true)

ifeq ($(shell test $(CM_PLATFORM_SDK_VERSION) -ge 4; echo $$?),0)

ifeq ($(shell test $(PLATFORM_SDK_VERSION) -gt 22; echo $$?),0)

    LOCAL_ADDITIONAL_DEPENDENCIES += \

        mount.ntfs \

        fsck.ntfs \

prebuilt/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -202,7 +202,7 @@ 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)

ifeq ($(shell test $(PLATFORM_SDK_VERSION) -gt 22; 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