From d53c7860cd663904e7ef529dfe527b16fd514f56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Konstantin=20K=C3=A4fer?= <mail@kkaefer.com>
Date: Mon, 8 Oct 2018 16:09:35 +0300
Subject: [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
---
 circle.yml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'circle.yml')

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:
-- 
cgit v1.2.1