From 2cae0f396ef64e18ca73a526bad93e3cd8fe951c Mon Sep 17 00:00:00 2001 From: e Date: Wed, 30 Aug 2023 14:54:31 -0300 Subject: [PATCH] Android: upgrade NDK version to 25.2.9519653 --- Android/agsplayer/app/build.gradle | 2 +- Android/library/runtime/build.gradle | 2 +- Editor/AGS.Editor/BuildTargets/BuildTargetAndroid.cs | 2 +- ci/android/Dockerfile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Android/agsplayer/app/build.gradle b/Android/agsplayer/app/build.gradle index ecdbf66c58c..82199c5b2a4 100644 --- a/Android/agsplayer/app/build.gradle +++ b/Android/agsplayer/app/build.gradle @@ -8,7 +8,7 @@ android { buildToolsVersion "33.0.1" // the android plugin has a bug that requires specifying ndkVersion in every module, even when unused // this version should match what is installed in the CI - ndkVersion '25.1.8937393' + ndkVersion '25.2.9519653' defaultConfig { applicationId "uk.co.adventuregamestudio.agsplayer" diff --git a/Android/library/runtime/build.gradle b/Android/library/runtime/build.gradle index 4724bd30768..04ff0e35fb7 100644 --- a/Android/library/runtime/build.gradle +++ b/Android/library/runtime/build.gradle @@ -25,7 +25,7 @@ else { android { compileSdkVersion 33 buildToolsVersion "33.0.1" - ndkVersion '25.1.8937393' + ndkVersion '25.2.9519653' defaultConfig { if (buildAsApplication) { diff --git a/Editor/AGS.Editor/BuildTargets/BuildTargetAndroid.cs b/Editor/AGS.Editor/BuildTargets/BuildTargetAndroid.cs index 33350f9c277..cdce5d5b72f 100644 --- a/Editor/AGS.Editor/BuildTargets/BuildTargetAndroid.cs +++ b/Editor/AGS.Editor/BuildTargets/BuildTargetAndroid.cs @@ -212,7 +212,7 @@ private void InstallSdkToolsIfNeeded() { string prjDir = GetAndroidProjectInCompiledDir(); - string packages = "\"build-tools;33.0.1\" \"ndk;25.1.8937393\" \"platforms;android-33\""; + string packages = "\"build-tools;33.0.1\" \"ndk;25.2.9519653\" \"platforms;android-33\""; AndroidUtilities.RunSdkManager(packages, prjDir); } diff --git a/ci/android/Dockerfile b/ci/android/Dockerfile index 348c3a3886c..8051fd5996e 100644 --- a/ci/android/Dockerfile +++ b/ci/android/Dockerfile @@ -1,6 +1,6 @@ FROM ghcr.io/cirruslabs/android-sdk:33-ndk # CirrusCI Android NDK image uses Ubuntu 22.04 -# ANDROID_NDK_VERSION=25.1.8937393 +# ANDROID_NDK_VERSION=25.2.9519653 # ANDROID_BUILD_TOOLS_VERSION=33.0.1 ARG APT_CONF_LOCAL=99local