diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2018-10-08 16:09:35 +0300 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2019-01-21 17:00:31 +0100 |
| commit | d53c7860cd663904e7ef529dfe527b16fd514f56 (patch) | |
| tree | e3e06015abc044fad57fe2722e1d87778089840a /platform | |
| parent | d0e7326e5d42dbed0792c535fd4f25b920b057f0 (diff) | |
| download | qtlocation-mapboxgl-d53c7860cd663904e7ef529dfe527b16fd514f56.tar.gz | |
[build] use optional polyfill on Android, and upgrade to NDK r19
<experimental/optional> is not available anymore in newer STL versions, e.g. according to libc++'s TS deprecation policy: https://libcxx.llvm.org/TS_deprecation.html
Diffstat (limited to 'platform')
| -rw-r--r-- | platform/android/config.cmake | 1 | ||||
| -rw-r--r-- | platform/android/gradle/dependencies.gradle | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/platform/android/config.cmake b/platform/android/config.cmake index d0d2c42eb6..50f1449a9e 100644 --- a/platform/android/config.cmake +++ b/platform/android/config.cmake @@ -139,6 +139,7 @@ target_include_directories(example-custom-layer ) target_link_libraries(example-custom-layer + PRIVATE optional PRIVATE -llog PRIVATE -lGLESv2 ) diff --git a/platform/android/gradle/dependencies.gradle b/platform/android/gradle/dependencies.gradle index ae63b46a2a..664d79ca90 100644 --- a/platform/android/gradle/dependencies.gradle +++ b/platform/android/gradle/dependencies.gradle @@ -4,7 +4,7 @@ ext { minSdkVersion : 14, targetSdkVersion : 27, compileSdkVersion: 27, - buildToolsVersion: '27.0.3' + buildToolsVersion: '28.0.3' ] versions = [ |