Merge pull request #44949 from m4gr3d/specify_project_ndk_version
Improve the logic to compile for Android
This commit is contained in:
@ -98,6 +98,8 @@ android {
|
||||
disable 'MissingTranslation', 'UnusedResources'
|
||||
}
|
||||
|
||||
ndkVersion versions.ndkVersion
|
||||
|
||||
packagingOptions {
|
||||
exclude 'META-INF/LICENSE'
|
||||
exclude 'META-INF/NOTICE'
|
||||
|
||||
@ -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.
|
||||
|
||||
]
|
||||
|
||||
|
||||
@ -31,6 +31,8 @@ android {
|
||||
}
|
||||
}
|
||||
|
||||
ndkVersion versions.ndkVersion
|
||||
|
||||
externalNativeBuild {
|
||||
cmake {
|
||||
path "CMakeLists.txt"
|
||||
|
||||
Reference in New Issue
Block a user