From cc7fbe6aec1611de4d6c0246145efdc574a596d4 Mon Sep 17 00:00:00 2001 From: Fredia Huya-Kouadio Date: Tue, 13 May 2025 08:27:36 -0700 Subject: [PATCH] Bump the NDK to version 28.1.13356709 Doing so automatically adds support for 16kib page to the Godot Android shared libraries. See https://developer.android.com/guide/practices/page-sizes#compile-16-kb-alignment for details. --- platform/android/detect.py | 2 +- platform/android/java/app/config.gradle | 2 +- platform/android/java/nativeSrcsConfigs/CMakeLists.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/platform/android/detect.py b/platform/android/detect.py index 6ddc9179936..013b66a73b7 100644 --- a/platform/android/detect.py +++ b/platform/android/detect.py @@ -64,7 +64,7 @@ def get_android_ndk_root(env: "SConsEnvironment"): # This is kept in sync with the value in 'platform/android/java/app/config.gradle'. def get_ndk_version(): - return "27.2.12479018" + return "28.1.13356709" # This is kept in sync with the value in 'platform/android/java/app/config.gradle'. diff --git a/platform/android/java/app/config.gradle b/platform/android/java/app/config.gradle index 197d5f82c4f..77e63df2f38 100644 --- a/platform/android/java/app/config.gradle +++ b/platform/android/java/app/config.gradle @@ -11,7 +11,7 @@ ext.versions = [ nexusPublishVersion: '1.3.0', javaVersion : JavaVersion.VERSION_17, // Also update 'platform/android/detect.py#get_ndk_version()' when this is updated. - ndkVersion : '27.2.12479018', + ndkVersion : '28.1.13356709', splashscreenVersion: '1.0.1', openxrVendorsVersion: '4.0.0-stable' diff --git a/platform/android/java/nativeSrcsConfigs/CMakeLists.txt b/platform/android/java/nativeSrcsConfigs/CMakeLists.txt index a5ecafeb09d..1584c6fd5ce 100644 --- a/platform/android/java/nativeSrcsConfigs/CMakeLists.txt +++ b/platform/android/java/nativeSrcsConfigs/CMakeLists.txt @@ -1,5 +1,5 @@ # Non functional cmake build file used to provide Android Studio editor support to the project. -cmake_minimum_required(VERSION 3.6) +cmake_minimum_required(VERSION 3.10) project(godot) set(CMAKE_CXX_STANDARD 14)