diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2016-07-01 17:40:21 +0200 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2016-07-01 18:26:55 +0200 |
| commit | eb7cfea7eacad8a179fb3167b88508f8f1f7fdd2 (patch) | |
| tree | e5ab5c09d1da08611d77c4387030c1956a9cd3e7 /platform/android/scripts | |
| parent | 77e784675687d13439a8104c97c5bb0a9ccd8b01 (diff) | |
| download | qtlocation-mapboxgl-eb7cfea7eacad8a179fb3167b88508f8f1f7fdd2.tar.gz | |
[android] upgrade to NDK r12b
Diffstat (limited to 'platform/android/scripts')
| -rw-r--r-- | platform/android/scripts/configure.sh | 2 | ||||
| -rwxr-xr-x | platform/android/scripts/debug.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/platform/android/scripts/configure.sh b/platform/android/scripts/configure.sh index 2bbc134597..b2bdce556d 100644 --- a/platform/android/scripts/configure.sh +++ b/platform/android/scripts/configure.sh @@ -10,7 +10,7 @@ ZLIB_VERSION=system NUNICODE_VERSION=1.6 LIBZIP_VERSION=0.11.2 GEOMETRY_VERSION=0.5.0 -GEOJSONVT_VERSION=4.1.2 +GEOJSONVT_VERSION=4.1.2-cxx11abi VARIANT_VERSION=1.1.0 RAPIDJSON_VERSION=1.0.2 JNI_HPP_VERSION=2.0.0 diff --git a/platform/android/scripts/debug.sh b/platform/android/scripts/debug.sh index ade9ab2d6f..efed96969a 100755 --- a/platform/android/scripts/debug.sh +++ b/platform/android/scripts/debug.sh @@ -11,7 +11,7 @@ export PATH="${MASON_DIR}:${PATH}" export MASON_ANDROID_ABI=x86 export MASON_ANDROID_ARCH=x86 export MASON_ANDROID_PLATFORM=9 -export MASON_NDK_PACKAGE_VERSION=${MASON_ANDROID_ARCH}-${MASON_ANDROID_PLATFORM}-r10e +export MASON_NDK_PACKAGE_VERSION=${MASON_ANDROID_ARCH}-${MASON_ANDROID_PLATFORM}-r12b if [[ $1 == '--prepare' ]]; then mkdir -p ~/.android/debugging/{vendor,system}_lib |