diff --git a/project/jni/Application.mk b/project/jni/Application.mk
index e78c7a5f2..ee5dcd2ff 100644
--- a/project/jni/Application.mk
+++ b/project/jni/Application.mk
@@ -2,7 +2,11 @@ APP_PROJECT_PATH := $(call my-dir)/..
 
 include jni/Settings.mk
 
+ifneq ($(filter c++_shared, $(APP_MODULES)),)
 APP_STL := c++_shared
+else
+APP_STL := none
+endif
 APP_CFLAGS := -g
 ifneq ($(NDK_DEBUG),1)
 APP_CFLAGS += -Oz -DNDEBUG # -Oz works best with clang
diff --git a/project/jni/application/setEnvironment-arm64-v8a.sh b/project/jni/application/setEnvironment-arm64-v8a.sh
index 318dfddbf..7a00927f9 100755
--- a/project/jni/application/setEnvironment-arm64-v8a.sh
+++ b/project/jni/application/setEnvironment-arm64-v8a.sh
@@ -37,7 +37,7 @@ all:
 
 APP_SHARED_LIBS=$(
 echo $APP_MODULES | xargs -n 1 echo | while read LIB ; do
-	STATIC=`echo $APP_AVAILABLE_STATIC_LIBS application sdl_main stlport stdout-test | grep "\\\\b$LIB\\\\b"`
+	STATIC=`echo $APP_AVAILABLE_STATIC_LIBS application sdl_main c++_shared | grep "\\\\b$LIB\\\\b"`
 	if [ -n "$STATIC" ] ; then true
 	else
 		case $LIB in
diff --git a/project/jni/application/setEnvironment-armeabi-v7a.sh b/project/jni/application/setEnvironment-armeabi-v7a.sh
index e142c4732..6a206f45c 100755
--- a/project/jni/application/setEnvironment-armeabi-v7a.sh
+++ b/project/jni/application/setEnvironment-armeabi-v7a.sh
@@ -38,7 +38,7 @@ all:
 
 APP_SHARED_LIBS=$(
 echo $APP_MODULES | xargs -n 1 echo | while read LIB ; do
-	STATIC=`echo $APP_AVAILABLE_STATIC_LIBS application sdl_main stlport stdout-test | grep "\\\\b$LIB\\\\b"`
+	STATIC=`echo $APP_AVAILABLE_STATIC_LIBS application sdl_main c++_shared | grep "\\\\b$LIB\\\\b"`
 	if [ -n "$STATIC" ] ; then true
 	else
 		case $LIB in
diff --git a/project/jni/application/setEnvironment-x86.sh b/project/jni/application/setEnvironment-x86.sh
index 881091371..113ab52db 100755
--- a/project/jni/application/setEnvironment-x86.sh
+++ b/project/jni/application/setEnvironment-x86.sh
@@ -37,7 +37,7 @@ all:
 
 APP_SHARED_LIBS=$(
 echo $APP_MODULES | xargs -n 1 echo | while read LIB ; do
-	STATIC=`echo $APP_AVAILABLE_STATIC_LIBS application sdl_main stlport stdout-test | grep "\\\\b$LIB\\\\b"`
+	STATIC=`echo $APP_AVAILABLE_STATIC_LIBS application sdl_main c++_shared | grep "\\\\b$LIB\\\\b"`
 	if [ -n "$STATIC" ] ; then true
 	else
 		case $LIB in
diff --git a/project/jni/application/setEnvironment-x86_64.sh b/project/jni/application/setEnvironment-x86_64.sh
index 6caafe957..593913f05 100755
--- a/project/jni/application/setEnvironment-x86_64.sh
+++ b/project/jni/application/setEnvironment-x86_64.sh
@@ -37,7 +37,7 @@ all:
 
 APP_SHARED_LIBS=$(
 echo $APP_MODULES | xargs -n 1 echo | while read LIB ; do
-	STATIC=`echo $APP_AVAILABLE_STATIC_LIBS application sdl_main stlport stdout-test | grep "\\\\b$LIB\\\\b"`
+	STATIC=`echo $APP_AVAILABLE_STATIC_LIBS application sdl_main c++_shared | grep "\\\\b$LIB\\\\b"`
 	if [ -n "$STATIC" ] ; then true
 	else
 		case $LIB in