diff options
author | Konstantin Käfer <mail@kkaefer.com> | 2018-06-21 14:44:00 +0200 |
---|---|---|
committer | Konstantin Käfer <mail@kkaefer.com> | 2018-09-11 11:43:54 +0200 |
commit | 4a3c4edb59b6881a30056531bc71e52295ab1cb0 (patch) | |
tree | b1c466667efc84cd5f7345d977032155f315ec76 /platform/android | |
parent | 30e570aae7d2ba5522feafb962b334ef3f35459e (diff) | |
download | qtlocation-mapboxgl-4a3c4edb59b6881a30056531bc71e52295ab1cb0.tar.gz |
[android] add support for gnustl
Diffstat (limited to 'platform/android')
-rw-r--r-- | platform/android/MapboxGLAndroidSDK/build.gradle | 8 | ||||
-rw-r--r-- | platform/android/src/geojson/feature.cpp | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/build.gradle b/platform/android/MapboxGLAndroidSDK/build.gradle index e796c35cee..d122687823 100644 --- a/platform/android/MapboxGLAndroidSDK/build.gradle +++ b/platform/android/MapboxGLAndroidSDK/build.gradle @@ -59,12 +59,18 @@ android { } } + // Allow determining the C++ STL we're using when building Mapbox GL. + def stl = 'c++_static' + if (project.hasProperty("mapbox.stl")) { + stl = project.getProperty("mapbox.stl") + } + defaultConfig { if (abi != 'none') { externalNativeBuild { cmake { arguments "-DANDROID_TOOLCHAIN=clang" - arguments "-DANDROID_STL=c++_static" + arguments "-DANDROID_STL=" + stl arguments "-DANDROID_CPP_FEATURES=rtti;exceptions" arguments "-DMBGL_PLATFORM=android" arguments "-DMASON_PLATFORM=android" diff --git a/platform/android/src/geojson/feature.cpp b/platform/android/src/geojson/feature.cpp index e79c238864..f0ed097842 100644 --- a/platform/android/src/geojson/feature.cpp +++ b/platform/android/src/geojson/feature.cpp @@ -2,6 +2,8 @@ #include "geometry.hpp" #include "../gson/json_object.hpp" +#include <mbgl/util/string.hpp> + namespace mbgl { namespace android { namespace geojson { |