diff options
| author | Tobrun <tobrun.van.nuland@gmail.com> | 2018-03-15 13:07:46 +0100 |
|---|---|---|
| committer | Tobrun <tobrun@mapbox.com> | 2018-05-22 17:53:34 +0200 |
| commit | 60505b03174b5ec02ae723beafa7683f6ed54a62 (patch) | |
| tree | f54cac803f072f534ca46c3f21eb9971a1591f19 /platform/android/config.cmake | |
| parent | cce72e2d36c5efe53bb026a0d98f835d16440ffa (diff) | |
| download | qtlocation-mapboxgl-60505b03174b5ec02ae723beafa7683f6ed54a62.tar.gz | |
[android] - remove mips and armeabi as supported ABIs
[android] - bump CI image to NDK 17 compatible
[core] - remove setting edgeDistance to 0, comparison 'const short' > 32767 is always false
[android] - remove throwing in desructor, undefined behaviour
[android] - bump dependency versions of project
Diffstat (limited to 'platform/android/config.cmake')
| -rw-r--r-- | platform/android/config.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/platform/android/config.cmake b/platform/android/config.cmake index 77074dc82c..c25e48de05 100644 --- a/platform/android/config.cmake +++ b/platform/android/config.cmake @@ -10,7 +10,7 @@ set(CMAKE_C_ARCHIVE_APPEND "<CMAKE_AR> ruT <TARGET> <LINK_FLAGS> <OBJECTS>") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ffunction-sections -fdata-sections") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -ffunction-sections -fdata-sections") -if ((ANDROID_ABI STREQUAL "armeabi") OR (ANDROID_ABI STREQUAL "armeabi-v7a") OR (ANDROID_ABI STREQUAL "arm64-v8a") OR +if ((ANDROID_ABI STREQUAL "armeabi-v7a") OR (ANDROID_ABI STREQUAL "arm64-v8a") OR (ANDROID_ABI STREQUAL "x86") OR (ANDROID_ABI STREQUAL "x86_64")) # Use Identical Code Folding on platforms that support the gold linker. set(CMAKE_EXE_LINKER_FLAGS "-fuse-ld=gold -Wl,--icf=safe ${CMAKE_EXE_LINKER_FLAGS}") |