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 /circle.yml | |
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 'circle.yml')
-rw-r--r-- | circle.yml | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/circle.yml b/circle.yml index 68d17b774d..c7f2d32250 100644 --- a/circle.yml +++ b/circle.yml @@ -15,6 +15,7 @@ workflows: - android-arm-v7-template: name: android-gnustl-arm-v7 stl: gnustl_shared + image: android-ndk-r17c:1d5db0eb34 - android-release: filters: tags: @@ -519,8 +520,11 @@ jobs: stl: type: string default: "c++_static" + image: + type: string + default: android-ndk-r19:8e91a7ebab docker: - - image: mbgl/android-ndk-r17c:dd161efed6 + - image: mbgl/<< parameters.image >> resource_class: large working_directory: /src environment: @@ -582,7 +586,7 @@ jobs: # ------------------------------------------------------------------------------ android-release: docker: - - image: mbgl/android-ndk-r17c:dd161efed6 + - image: mbgl/android-ndk-r19:8e91a7ebab resource_class: large working_directory: /src environment: |