diff --git a/buildscripts/include/depinfo.sh b/buildscripts/include/depinfo.sh index b36a83f..f9dc053 100755 --- 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 index ab0a505..0b5f30b 100755 --- 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 index 38c1010..3c47bc2 100755 --- 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"