2
0
Эх сурвалжийг харах

Merge pull request #106358 from m4gr3d/update_ndk_28

[Android] Add support for 16 KB page sizes, update to NDK r28b
Thaddeus Crews 3 сар өмнө
parent
commit
82ea0b9293

+ 1 - 1
platform/android/detect.py

@@ -68,7 +68,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'.

+ 1 - 1
platform/android/java/app/config.gradle

@@ -13,7 +13,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'
 

+ 1 - 1
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)