pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[android] Minor abi rewording during the build

Browse source 
Signed-off-by: Alexander Borsuk <me@alex.bio>
This commit is contained in:
Alexander Borsuk 2021-03-25 22:20:50 +01:00 • committed by Alexander Borsuk
parent 446b9e16a7
commit e0bbe4fdad
1 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
android/build.gradle
View file

@ -187,7 +187,7 @@ android {
if (project.hasProperty('pch')) pchFlag = 'ON'
cmake {
version "3.8.0+"
version '3.8.0+'
cppFlags '-fexceptions', '-frtti', '-std=c++17'
cFlags '-ffunction-sections', '-fdata-sections',
'-Wno-extern-c-compat'
@ -198,25 +198,25 @@ android {
ndk {
abiFilters = new HashSet<>()
if (project.hasProperty("arm32")) {
println("Building for the ARM32 architecture")
abiFilters.add("armeabi-v7a")
} else if (project.hasProperty("arm64")) {
println("Building for the ARM64 architecture")
abiFilters.add("arm64-v8a")
} else if (project.hasProperty("x86_64")) {
println("Building for the x86_64 architecture")
abiFilters.add("x86_64")
} else if (project.hasProperty("x86")) {
println("Building for the x86 architecture")
abiFilters.add("x86")
if (project.hasProperty('arm32') || project.hasProperty('armeabi-v7a')) {
println('Building for armeabi-v7a')
abiFilters.add('armeabi-v7a')
} else if (project.hasProperty('arm64') || project.hasProperty('arm64-v8a')) {
println('Building for arm64-v8a')
abiFilters.add('arm64-v8a')
} else if (project.hasProperty('x86_64')) {
println('Building for x86_64')
abiFilters.add('x86_64')
} else if (project.hasProperty('x86')) {
println('Building for x86')
abiFilters.add('x86')
} else {
if (!project.hasProperty('splitApk')) {
println("Building for the ARM and x86 architectures")
abiFilters.add("x86")
abiFilters.add("x86_64")
abiFilters.add("armeabi-v7a")
abiFilters.add("arm64-v8a")
println('Building for armeabi-v7a, arm64-v8a, x86, x86_64')
abiFilters.add('x86')
abiFilters.add('x86_64')
abiFilters.add('armeabi-v7a')
abiFilters.add('arm64-v8a')
}
}
}