diff --git a/Android.mk b/Android.mk
index 47c4aa1d..5ee7bf96 100644
--- a/Android.mk
+++ b/Android.mk
@@ -109,7 +109,7 @@ LOCAL_STATIC_LIBRARIES += libguitwrp
 LOCAL_SHARED_LIBRARIES += libz libc libcutils libstdc++ libtar libblkid libminuitwrp libminadbd libmtdutils libminzip libaosprecovery
 LOCAL_SHARED_LIBRARIES += libcrecovery
 
-ifneq ($(wildcard external/stlport/Android.mk),)
+ifeq (,$(filter $(PLATFORM_SDK_VERSION), 23))
     LOCAL_SHARED_LIBRARIES += libstlport
 else
     LOCAL_SHARED_LIBRARIES += libc++
diff --git a/mtp/Android.mk b/mtp/Android.mk
index 20404255..38d31aea 100755
--- a/mtp/Android.mk
+++ b/mtp/Android.mk
@@ -31,7 +31,7 @@ LOCAL_SRC_FILES = \
     node.cpp
 LOCAL_SHARED_LIBRARIES += libz libc libusbhost libstdc++ libdl libcutils libutils libaosprecovery
 
-ifneq ($(wildcard external/stlport/Android.mk),)
+ifeq (,$(filter $(PLATFORM_SDK_VERSION), 23))
     LOCAL_SHARED_LIBRARIES += libstlport
 else
     LOCAL_SHARED_LIBRARIES += libc++