From 12993efb3a92ca78e3b1e80d74b1aa9464209fd5 Mon Sep 17 00:00:00 2001
From: pelya <x.pelya.x@gmail.com>
Date: Tue, 5 Jan 2021 00:46:54 +0200
Subject: [PATCH] SDL: updated setEnvironment.sh scripts to skip helper
 libraries

---
 project/jni/application/setEnvironment-arm64-v8a.sh   | 10 +++++-----
 project/jni/application/setEnvironment-armeabi-v7a.sh |  8 ++++----
 project/jni/application/setEnvironment-x86.sh         |  8 ++++----
 project/jni/application/setEnvironment-x86_64.sh      |  8 ++++----
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/project/jni/application/setEnvironment-arm64-v8a.sh b/project/jni/application/setEnvironment-arm64-v8a.sh
index 1a1e89714..5ecadc4a9 100755
--- a/project/jni/application/setEnvironment-arm64-v8a.sh
+++ b/project/jni/application/setEnvironment-arm64-v8a.sh
@@ -7,8 +7,8 @@ NDK=`which ndk-build`
 NDK=`dirname $NDK`
 
 if uname -s | grep -i "linux" > /dev/null ; then
-  MYARCH=linux-$(arch)
-  NDK=`readlink -f $NDK`
+	MYARCH=linux-$(arch)
+	NDK=`readlink -f $NDK`
 elif uname -s | grep -i "darwin" > /dev/null ; then
 	MYARCH=darwin-x86_64
 elif uname -s | grep -i "windows" > /dev/null ; then
@@ -27,7 +27,7 @@ ARCH=arm64-v8a
 GCCPREFIX=aarch64-linux-android
 APILEVEL=21
 
-APP_MODULES=`grep 'APP_MODULES [:][=]' $LOCAL_PATH/../Settings.mk | sed 's@.*[=]\(.*\)@\1@'`
+APP_MODULES=`grep 'APP_MODULES [:][=]' $LOCAL_PATH/../Settings.mk | sed 's@.*[=]\(.*\)@\1@' | sed 's@\b\(application\|sdl_main\|sdl_native_helpers\|c++_shared\)\b@@g'`
 
 APP_AVAILABLE_STATIC_LIBS="`echo '
 include $(LOCAL_PATH)/../Settings.mk
@@ -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 c++_shared | grep "\\\\b$LIB\\\\b"`
+	STATIC=`echo $APP_AVAILABLE_STATIC_LIBS | grep "\\\\b$LIB\\\\b"`
 	if [ -n "$STATIC" ] ; then true
 	else
 		case $LIB in
@@ -63,7 +63,7 @@ if [ -n "$NO_SHARED_LIBS" ]; then
 fi
 
 APP_SHARED_LIBS="`echo $APP_SHARED_LIBS | sed \"s@\([-a-zA-Z0-9_.]\+\)@$LOCAL_PATH/../../obj/local/$ARCH/lib\1.so@g\"`"
-APP_MODULES_INCLUDE="`echo $APP_MODULES | sed 's@\bc++_shared\b@@' | sed 's@\bapplication\b@@' | sed \"s@\([-a-zA-Z0-9_.]\+\)@-isystem$LOCAL_PATH/../\1/include@g\"`"
+APP_MODULES_INCLUDE="`echo $APP_MODULES | sed \"s@\([-a-zA-Z0-9_.]\+\)@-isystem$LOCAL_PATH/../\1/include@g\"`"
 
 CFLAGS="
 -g
diff --git a/project/jni/application/setEnvironment-armeabi-v7a.sh b/project/jni/application/setEnvironment-armeabi-v7a.sh
index 6acf757ad..e052309ab 100755
--- a/project/jni/application/setEnvironment-armeabi-v7a.sh
+++ b/project/jni/application/setEnvironment-armeabi-v7a.sh
@@ -8,7 +8,7 @@ NDK=`dirname $NDK`
 
 if uname -s | grep -i "linux" > /dev/null ; then
 	MYARCH=linux-$(arch)
-  NDK=`readlink -f $NDK`
+	NDK=`readlink -f $NDK`
 elif uname -s | grep -i "darwin" > /dev/null ; then
 	MYARCH=darwin-x86_64
 elif uname -s | grep -i "windows" > /dev/null ; then
@@ -28,7 +28,7 @@ GCCPREFIX=armv7a-linux-androideabi
 BINUTILSPREFIX=arm-linux-androideabi
 APILEVEL=16
 
-APP_MODULES=`grep 'APP_MODULES [:][=]' $LOCAL_PATH/../Settings.mk | sed 's@.*[=]\(.*\)@\1@'`
+APP_MODULES=`grep 'APP_MODULES [:][=]' $LOCAL_PATH/../Settings.mk | sed 's@.*[=]\(.*\)@\1@' | sed 's@\b\(application\|sdl_main\|sdl_native_helpers\|c++_shared\)\b@@g'`
 
 APP_AVAILABLE_STATIC_LIBS="`echo '
 include $(LOCAL_PATH)/../Settings.mk
@@ -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 c++_shared | grep "\\\\b$LIB\\\\b"`
+	STATIC=`echo $APP_AVAILABLE_STATIC_LIBS | grep "\\\\b$LIB\\\\b"`
 	if [ -n "$STATIC" ] ; then true
 	else
 		case $LIB in
@@ -64,7 +64,7 @@ if [ -n "$NO_SHARED_LIBS" ]; then
 fi
 
 APP_SHARED_LIBS="`echo $APP_SHARED_LIBS | sed \"s@\([-a-zA-Z0-9_.]\+\)@$LOCAL_PATH/../../obj/local/$ARCH/lib\1.so@g\"`"
-APP_MODULES_INCLUDE="`echo $APP_MODULES | sed 's@\bc++_shared\b@@' | sed 's@\bapplication\b@@' | sed \"s@\([-a-zA-Z0-9_.]\+\)@-isystem$LOCAL_PATH/../\1/include@g\"`"
+APP_MODULES_INCLUDE="`echo $APP_MODULES | sed \"s@\([-a-zA-Z0-9_.]\+\)@-isystem$LOCAL_PATH/../\1/include@g\"`"
 
 CFLAGS="
 -g
diff --git a/project/jni/application/setEnvironment-x86.sh b/project/jni/application/setEnvironment-x86.sh
index 50c7a7b87..e15ad1b3a 100755
--- a/project/jni/application/setEnvironment-x86.sh
+++ b/project/jni/application/setEnvironment-x86.sh
@@ -8,7 +8,7 @@ NDK=`dirname $NDK`
 
 if uname -s | grep -i "linux" > /dev/null ; then
 	MYARCH=linux-$(arch)
-  NDK=`readlink -f $NDK`
+	NDK=`readlink -f $NDK`
 elif uname -s | grep -i "darwin" > /dev/null ; then
 	MYARCH=darwin-x86_64
 elif uname -s | grep -i "windows" > /dev/null ; then
@@ -27,7 +27,7 @@ ARCH=x86
 GCCPREFIX=i686-linux-android
 APILEVEL=16
 
-APP_MODULES=`grep 'APP_MODULES [:][=]' $LOCAL_PATH/../Settings.mk | sed 's@.*[=]\(.*\)@\1@'`
+APP_MODULES=`grep 'APP_MODULES [:][=]' $LOCAL_PATH/../Settings.mk | sed 's@.*[=]\(.*\)@\1@' | sed 's@\b\(application\|sdl_main\|sdl_native_helpers\|c++_shared\)\b@@g'`
 
 APP_AVAILABLE_STATIC_LIBS="`echo '
 include $(LOCAL_PATH)/../Settings.mk
@@ -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 c++_shared | grep "\\\\b$LIB\\\\b"`
+	STATIC=`echo $APP_AVAILABLE_STATIC_LIBS | grep "\\\\b$LIB\\\\b"`
 	if [ -n "$STATIC" ] ; then true
 	else
 		case $LIB in
@@ -63,7 +63,7 @@ if [ -n "$NO_SHARED_LIBS" ]; then
 fi
 
 APP_SHARED_LIBS="`echo $APP_SHARED_LIBS | sed \"s@\([-a-zA-Z0-9_.]\+\)@$LOCAL_PATH/../../obj/local/$ARCH/lib\1.so@g\"`"
-APP_MODULES_INCLUDE="`echo $APP_MODULES | sed 's@\bc++_shared\b@@' | sed 's@\bapplication\b@@' | sed \"s@\([-a-zA-Z0-9_.]\+\)@-isystem$LOCAL_PATH/../\1/include@g\"`"
+APP_MODULES_INCLUDE="`echo $APP_MODULES | sed \"s@\([-a-zA-Z0-9_.]\+\)@-isystem$LOCAL_PATH/../\1/include@g\"`"
 
 CFLAGS="
 -g
diff --git a/project/jni/application/setEnvironment-x86_64.sh b/project/jni/application/setEnvironment-x86_64.sh
index a0fdc2521..b566f5394 100755
--- a/project/jni/application/setEnvironment-x86_64.sh
+++ b/project/jni/application/setEnvironment-x86_64.sh
@@ -8,7 +8,7 @@ NDK=`dirname $NDK`
 
 if uname -s | grep -i "linux" > /dev/null ; then
 	MYARCH=linux-$(arch)
-  NDK=`readlink -f $NDK`
+	NDK=`readlink -f $NDK`
 elif uname -s | grep -i "darwin" > /dev/null ; then
 	MYARCH=darwin-x86_64
 elif uname -s | grep -i "windows" > /dev/null ; then
@@ -27,7 +27,7 @@ ARCH=x86_64
 GCCPREFIX=x86_64-linux-android
 APILEVEL=21
 
-APP_MODULES=`grep 'APP_MODULES [:][=]' $LOCAL_PATH/../Settings.mk | sed 's@.*[=]\(.*\)@\1@'`
+APP_MODULES=`grep 'APP_MODULES [:][=]' $LOCAL_PATH/../Settings.mk | sed 's@.*[=]\(.*\)@\1@' | sed 's@\b\(application\|sdl_main\|sdl_native_helpers\|c++_shared\)\b@@g'`
 
 APP_AVAILABLE_STATIC_LIBS="`echo '
 include $(LOCAL_PATH)/../Settings.mk
@@ -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 c++_shared | grep "\\\\b$LIB\\\\b"`
+	STATIC=`echo $APP_AVAILABLE_STATIC_LIBS | grep "\\\\b$LIB\\\\b"`
 	if [ -n "$STATIC" ] ; then true
 	else
 		case $LIB in
@@ -63,7 +63,7 @@ if [ -n "$NO_SHARED_LIBS" ]; then
 fi
 
 APP_SHARED_LIBS="`echo $APP_SHARED_LIBS | sed \"s@\([-a-zA-Z0-9_.]\+\)@$LOCAL_PATH/../../obj/local/$ARCH/lib\1.so@g\"`"
-APP_MODULES_INCLUDE="`echo $APP_MODULES | sed 's@\bc++_shared\b@@' | sed 's@\bapplication\b@@' | sed \"s@\([-a-zA-Z0-9_.]\+\)@-isystem$LOCAL_PATH/../\1/include@g\"`"
+APP_MODULES_INCLUDE="`echo $APP_MODULES | sed \"s@\([-a-zA-Z0-9_.]\+\)@-isystem$LOCAL_PATH/../\1/include@g\"`"
 
 CFLAGS="
 -g