Rename ndk version var

jarnedemeulemeester · Jan 1, 2023 · 5759a7f · 5759a7f
1 parent 652799b
commit 5759a7f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/buildscripts/include/depinfo.sh b/buildscripts/include/depinfo.sh
@@ -3,8 +3,7 @@
 ## Dependency versions
 
 v_sdk=9123335_latest
-v_ndk=r25b
-v_ndk_n=25.1.8937393
+v_ndk=25.1.8937393
 v_sdk_build_tools=33.0.1
 
 v_lua=5.2.4

diff --git a/buildscripts/include/download-sdk.sh b/buildscripts/include/download-sdk.sh
@@ -62,7 +62,7 @@ sdkmanager () {
 echo y | sdkmanager \
 	"platforms;android-33" \
 	"build-tools;${v_sdk_build_tools}" \
-	"ndk;${v_ndk_n}" \
+	"ndk;${v_ndk}" \
 	"cmake;3.22.1"
 
 # gas-preprocessor

diff --git a/buildscripts/include/path.sh b/buildscripts/include/path.sh
@@ -23,6 +23,6 @@ if [ -n "$ndk_triple" ]; then
 	unset PKG_CONFIG_PATH
 fi
 
-toolchain=$(echo "$DIR/sdk/android-sdk-linux/ndk/$v_ndk_n/toolchains/llvm/prebuilt/"*)
-export PATH="$toolchain/bin:$DIR/sdk/android-sdk-linux/ndk/$v_ndk_n:$DIR/sdk/bin:$PATH"
+toolchain=$(echo "$DIR/sdk/android-sdk-linux/ndk/$v_ndk/toolchains/llvm/prebuilt/"*)
+export PATH="$toolchain/bin:$DIR/sdk/android-sdk-linux/ndk/$v_ndk:$DIR/sdk/bin:$PATH"
 export ANDROID_HOME="$DIR/sdk/android-sdk-$os"