diff --git a/.github/actions/setup-godot-cpp/action.yml b/.github/actions/setup-godot-cpp/action.yml index 1be9293c..d67bb999 100644 --- a/.github/actions/setup-godot-cpp/action.yml +++ b/.github/actions/setup-godot-cpp/action.yml @@ -20,7 +20,7 @@ inputs: default: 12.2.0 description: MinGW version. ndk-version: - default: r23c + default: r28b description: Android NDK version. buildtool: default: scons diff --git a/.github/workflows/ci-cmake.yml b/.github/workflows/ci-cmake.yml index 7d5e7731..cc7ae6b0 100644 --- a/.github/workflows/ci-cmake.yml +++ b/.github/workflows/ci-cmake.yml @@ -73,8 +73,8 @@ jobs: platform: android config-flags: -G Ninja -DCMAKE_BUILD_TYPE=Release - --toolchain ${ANDROID_HOME}/ndk/23.2.8568313/build/cmake/android.toolchain.cmake - -DANDROID_PLATFORM=21 -DANDROID_ABI=arm64-v8a + --toolchain ${ANDROID_HOME}/ndk/28.1.13356709/build/cmake/android.toolchain.cmake + -DANDROID_PLATFORM=24 -DANDROID_ABI=arm64-v8a artifact-name: godot-cpp-android-arm64-release.cmake artifact-path: cmake-build/bin/libgodot-cpp.android.template_release.arm64.a flags: arch=arm64 diff --git a/cmake/android.cmake b/cmake/android.cmake index 1d3a93b6..7c442bb1 100644 --- a/cmake/android.cmake +++ b/cmake/android.cmake @@ -34,7 +34,7 @@ function(android_options) more information android_api_level : Target Android API level. - Default = 21 + Default = 24 ANDROID_HOME : Path to your Android SDK installation. Default = os.environ.get("ANDROID_HOME", os.environ.get("ANDROID_SDK_ROOT") diff --git a/doc/cmake.rst b/doc/cmake.rst index 760d4561..467ba0bf 100644 --- a/doc/cmake.rst +++ b/doc/cmake.rst @@ -253,7 +253,7 @@ own toolchain file as listed in the cmake-toolchains_ documentation Or use the toolchain and scripts provided by the Android SDK and make changes using the ``ANDROID_*`` variables listed there. Where ```` is whatever -ndk version you have installed (tested with `23.2.8568313`) and ```` +ndk version you have installed (tested with `28.1.13356709`) and ```` is for android sdk platform, (tested with ``android-29``) .. warning:: diff --git a/tools/android.py b/tools/android.py index dbd38cdf..e63c1fd2 100644 --- a/tools/android.py +++ b/tools/android.py @@ -9,12 +9,12 @@ def options(opts): opts.Add( "android_api_level", "Target Android API level", - "21", + "24", ) opts.Add( "ndk_version", "Fully qualified version of ndk to use for compilation.", - "23.2.8568313", + "28.1.13356709", ) opts.Add( "ANDROID_HOME", @@ -48,9 +48,9 @@ def generate(env): my_spawn.configure(env) # Validate API level - if int(env["android_api_level"]) < 21: - print("WARNING: minimum supported Android target api is 21. Forcing target api 21.") - env["android_api_level"] = "21" + if int(env["android_api_level"]) < 24: + print("WARNING: minimum supported Android target api is 24. Forcing target api 24.") + env["android_api_level"] = "24" # Setup toolchain toolchain = get_android_ndk_root(env) + "/toolchains/llvm/prebuilt/"