Skip to content

Commit 82ea0b9

Browse files
committed
Merge pull request #106358 from m4gr3d/update_ndk_28
[Android] Add support for 16 KB page sizes, update to NDK r28b
2 parents bd73ab4 + 27bdc86 commit 82ea0b9

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

platform/android/detect.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ def get_android_ndk_root(env: "SConsEnvironment"):
6868

6969
# This is kept in sync with the value in 'platform/android/java/app/config.gradle'.
7070
def get_ndk_version():
71-
return "27.2.12479018"
71+
return "28.1.13356709"
7272

7373

7474
# This is kept in sync with the value in 'platform/android/java/app/config.gradle'.

platform/android/java/app/config.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ext.versions = [
1313
nexusPublishVersion: '1.3.0',
1414
javaVersion : JavaVersion.VERSION_17,
1515
// Also update 'platform/android/detect.py#get_ndk_version()' when this is updated.
16-
ndkVersion : '27.2.12479018',
16+
ndkVersion : '28.1.13356709',
1717
splashscreenVersion: '1.0.1',
1818
openxrVendorsVersion: '4.0.0-stable'
1919

platform/android/java/nativeSrcsConfigs/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Non functional cmake build file used to provide Android Studio editor support to the project.
2-
cmake_minimum_required(VERSION 3.6)
2+
cmake_minimum_required(VERSION 3.10)
33
project(godot)
44

55
set(CMAKE_CXX_STANDARD 14)

0 commit comments

Comments
 (0)