summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcyberta <cyberta@riseup.net>2021-08-03 01:38:43 +0200
committercyberta <cyberta@riseup.net>2021-08-03 01:38:43 +0200
commitc3fd98026f52bcc801a5ed1212c61897a48e3b44 (patch)
tree70a6013c5b6e762e45e9b15fdf56c25e8f53d31f
parent0ee29854eccf82d0d387ec8bf888c22a1786baca (diff)
fix ANDROID_NDK_HOME if ndk was manually downloaded
-rwxr-xr-xscripts/build_deps.sh5
1 files changed, 5 insertions, 0 deletions
diff --git a/scripts/build_deps.sh b/scripts/build_deps.sh
index 58ed65c5..eb731fcd 100755
--- a/scripts/build_deps.sh
+++ b/scripts/build_deps.sh
@@ -14,6 +14,8 @@ DIR_GOLIBS=./bitmaskcore/lib/
#FILE_ARM=./go/out/armeabi-v7a/piedispatcherlib
DIR_TORLIBS=./tor-android/external/lib
EXPECTED_NDK_VERSION="21.4.7075529"
+EXPECTED_ANDROID_NDK_RELEASE_VERSION="r21e"
+
# init
# look for empty dir
@@ -23,6 +25,9 @@ cd $BASE_DIR
if [[ $(ls -A ${ANDROID_HOME}/ndk/${EXPECTED_NDK_VERSION}) ]]
then
ANDROID_NDK_HOME=${ANDROID_HOME}/ndk/${EXPECTED_NDK_VERSION}
+else
+ # ndk was manually downloaded from http://dl.google.com/android/repository
+ ANDROID_NDK_HOME=${ANDROID_HOME}/android-ndk-${EXPECTED_ANDROID_NDK_RELEASE_VERSION}
fi
NDK_VERSION=`cat $ANDROID_NDK_HOME/source.properties | grep Pkg.Revision | cut -d "=" -f2 | sed 's/ //g'`