From 7b7fa94ff24aa56faf5123e867c2206c2ca69852 Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Thu, 15 Jul 2021 12:11:05 +0200
Subject: try to set ANDROID_NDK_HOME to expected NDK version

---
 scripts/build_deps.sh | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'scripts/build_deps.sh')

diff --git a/scripts/build_deps.sh b/scripts/build_deps.sh
index e865bd49..58ed65c5 100755
--- a/scripts/build_deps.sh
+++ b/scripts/build_deps.sh
@@ -13,13 +13,21 @@ DIR_GOLIBS=./bitmaskcore/lib/
 #FILE_X86=./go/out/x86/piedispatcherlib
 #FILE_ARM=./go/out/armeabi-v7a/piedispatcherlib
 DIR_TORLIBS=./tor-android/external/lib
-NDK_VERSION=`cat $ANDROID_NDK_HOME/source.properties | grep Pkg.Revision | cut -d "=" -f2 | sed 's/ //g'`
 EXPECTED_NDK_VERSION="21.4.7075529"
 # init
 # look for empty dir
 
 cd $BASE_DIR
 
+# try to set the expected ndk version
+if [[ $(ls -A ${ANDROID_HOME}/ndk/${EXPECTED_NDK_VERSION}) ]]
+then
+  ANDROID_NDK_HOME=${ANDROID_HOME}/ndk/${EXPECTED_NDK_VERSION}
+fi
+NDK_VERSION=`cat $ANDROID_NDK_HOME/source.properties | grep Pkg.Revision | cut -d "=" -f2 | sed 's/ //g'`
+
+
+# build tor libs
 if [[ $(ls -A ${DIR_TORLIBS}) ]]
 then
   echo "Dirty build: Reusing tor libraries"
@@ -40,6 +48,7 @@ else
   cd ..
 fi
 
+# build openvpn libs
 if [[ $(ls -A ${DIR_OVPNASSETS}) && $(ls -A ${DIR_OVPNLIBS}) ]]
 then
     echo "Dirty build: skipped externalNativeBuild - reusing existing libs"
@@ -50,6 +59,7 @@ else
     cd ..
 fi
 
+# build bitmask core (shapeshifter, snowflake, pgpverify)
 if [[ $(ls -A ${DIR_GOLIBS}) ]]
 then
     echo "Dirty build: Reusing go libraries"
-- 
cgit v1.2.3