diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-11-30 21:36:55 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-30 21:36:55 +0100 |
| commit | 0ff8742919af72c7412e63ef0f646cb4e7bd7d8f (patch) | |
| tree | 65b374f2309476a80e002f99cf672d8d70e4ab61 /platform/android/java | |
| parent | 0bb1e89fb7046209f64d46ccedc6b42645c96573 (diff) | |
| parent | 2aba13e8fbba9ece140ebc3aeb8ae824e9d22f0a (diff) | |
Merge pull request #67610 from m4gr3d/add_check_for_min_ndk_target_api_main
Bump the minimum Android target api to 21 (Android Lollipop)
Diffstat (limited to 'platform/android/java')
| -rw-r--r-- | platform/android/java/app/config.gradle | 9 | ||||
| -rw-r--r-- | platform/android/java/nativeSrcsConfigs/CMakeLists.txt | 2 |
2 files changed, 7 insertions, 4 deletions
diff --git a/platform/android/java/app/config.gradle b/platform/android/java/app/config.gradle index e1d9dc4cde..f1b4bfd534 100644 --- a/platform/android/java/app/config.gradle +++ b/platform/android/java/app/config.gradle @@ -1,14 +1,17 @@ ext.versions = [ androidGradlePlugin: '7.2.1', compileSdk : 32, - minSdk : 19, // Also update 'platform/android/export/export_plugin.cpp#DEFAULT_MIN_SDK_VERSION' - targetSdk : 32, // Also update 'platform/android/export/export_plugin.cpp#DEFAULT_TARGET_SDK_VERSION' + // Also update 'platform/android/export/export_plugin.cpp#DEFAULT_MIN_SDK_VERSION' + minSdk : 21, + // Also update 'platform/android/export/export_plugin.cpp#DEFAULT_TARGET_SDK_VERSION' + targetSdk : 32, buildTools : '32.0.0', kotlinVersion : '1.7.0', fragmentVersion : '1.3.6', nexusPublishVersion: '1.1.0', javaVersion : 11, - ndkVersion : '23.2.8568313' // Also update 'platform/android/detect.py#get_ndk_version()' when this is updated. + // Also update 'platform/android/detect.py#get_ndk_version()' when this is updated. + ndkVersion : '23.2.8568313' ] diff --git a/platform/android/java/nativeSrcsConfigs/CMakeLists.txt b/platform/android/java/nativeSrcsConfigs/CMakeLists.txt index 1325063a57..e1534c7685 100644 --- a/platform/android/java/nativeSrcsConfigs/CMakeLists.txt +++ b/platform/android/java/nativeSrcsConfigs/CMakeLists.txt @@ -17,4 +17,4 @@ target_include_directories(${PROJECT_NAME} SYSTEM PUBLIC ${GODOT_ROOT_DIR}) -add_definitions(-DUNIX_ENABLED -DVULKAN_ENABLED -DANDROID_ENABLED -DGLES3_ENABLED) +add_definitions(-DUNIX_ENABLED -DVULKAN_ENABLED -DANDROID_ENABLED -DGLES3_ENABLED -DTOOLS_ENABLED) |