fix ndk versions

6 years ago · cc319ad4fd
3 changed files with 5 additions and 3 deletions
--- a/build-package.sh
+++ b/build-package.sh
@ -358,7 +358,7 @@ termux_step_setup_variables() {
 	if [ ! -d "$NDK" ]; then
 		termux_error_exit 'NDK not pointing at a directory!'
 	fi
-	if ! grep -s -q "Pkg.Revision = $TERMUX_NDK_VERSION" "$NDK/source.properties"; then
+	if ! grep -s -q "Pkg.Revision = $TERMUX_NDK_VERSION_NUM" "$NDK/source.properties"; then
 		termux_error_exit "Wrong NDK version - we need $TERMUX_NDK_VERSION"
 	fi

--- a/scripts/properties.sh
+++ b/scripts/properties.sh
@ -1,5 +1,7 @@
 TERMUX_ANDROID_BUILD_TOOLS_VERSION=28.0.3
-TERMUX_NDK_VERSION=19
+TERMUX_NDK_VERSION_NUM=19
+TERMUX_NDK_REVISION=b
+TERMUX_NDK_VERSION=$TERMUX_NDK_VERSION_NUM$TERMUX_NDK_REVISION

 test -f "$HOME/.termuxrc" && . "$HOME/.termuxrc"

--- a/scripts/setup-android-sdk.sh
+++ b/scripts/setup-android-sdk.sh
@ -6,7 +6,7 @@ set -e -u

 ANDROID_SDK_FILE=sdk-tools-linux-4333796.zip
 ANDROID_SDK_SHA256=92ffee5a1d98d856634e8b71132e8a95d96c83a63fde1099be3d86df3106def9
-ANDROID_NDK_FILE=android-ndk-r${TERMUX_NDK_VERSION}b-Linux-x86_64.zip
+ANDROID_NDK_FILE=android-ndk-r${TERMUX_NDK_VERSION}-Linux-x86_64.zip
 ANDROID_NDK_SHA256=0fbb1645d0f1de4dde90a4ff79ca5ec4899c835e729d692f433fda501623257a

 if [ ! -d $ANDROID_HOME ]; then