diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-02-05 13:27:37 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-05 13:27:37 +0100 |
| commit | 54857d7e81aa55578735b6af5333b2e64d05a6a9 (patch) | |
| tree | 0aa2401f59f4c718e23ab06ff723b0ae07443c77 /platform/android/java | |
| parent | 3de411cb836cf13c41bb4b048dd5af5ab52a077c (diff) | |
| parent | eee213e01a26054906fd07423f3620c98b786956 (diff) | |
Merge pull request #44949 from m4gr3d/specify_project_ndk_version
Improve the logic to compile for Android
Diffstat (limited to 'platform/android/java')
| -rw-r--r-- | platform/android/java/app/build.gradle | 2 | ||||
| -rw-r--r-- | platform/android/java/app/config.gradle | 3 | ||||
| -rw-r--r-- | platform/android/java/nativeSrcsConfigs/build.gradle | 2 |
3 files changed, 6 insertions, 1 deletions
diff --git a/platform/android/java/app/build.gradle b/platform/android/java/app/build.gradle index 53d11fda5b..814cc30613 100644 --- a/platform/android/java/app/build.gradle +++ b/platform/android/java/app/build.gradle @@ -98,6 +98,8 @@ android { disable 'MissingTranslation', 'UnusedResources' } + ndkVersion versions.ndkVersion + packagingOptions { exclude 'META-INF/LICENSE' exclude 'META-INF/NOTICE' diff --git a/platform/android/java/app/config.gradle b/platform/android/java/app/config.gradle index 80cf6f7ede..8d3aa8a6b0 100644 --- a/platform/android/java/app/config.gradle +++ b/platform/android/java/app/config.gradle @@ -7,7 +7,8 @@ ext.versions = [ supportCoreUtils : '1.0.0', kotlinVersion : '1.4.10', v4Support : '1.0.0', - javaVersion : 1.8 + javaVersion : 1.8, + ndkVersion : '21.3.6528147' // Also update 'platform/android/detect.py#get_project_ndk_version()' when this is updated. ] diff --git a/platform/android/java/nativeSrcsConfigs/build.gradle b/platform/android/java/nativeSrcsConfigs/build.gradle index 65b7bb9dc9..66077060ea 100644 --- a/platform/android/java/nativeSrcsConfigs/build.gradle +++ b/platform/android/java/nativeSrcsConfigs/build.gradle @@ -31,6 +31,8 @@ android { } } + ndkVersion versions.ndkVersion + externalNativeBuild { cmake { path "CMakeLists.txt" |