From eb7cfea7eacad8a179fb3167b88508f8f1f7fdd2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Konstantin=20K=C3=A4fer?= <mail@kkaefer.com>
Date: Fri, 1 Jul 2016 17:40:21 +0200
Subject: [PATCH] [android] upgrade to NDK r12b

---
 .mason                                | 2 +-
 platform/android/scripts/configure.sh | 2 +-
 platform/android/scripts/debug.sh     | 2 +-
 src/mbgl/util/math.cpp                | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.mason b/.mason
index 98feac14b..3017f6742 160000
--- a/.mason
+++ b/.mason
@@ -1 +1 @@
-Subproject commit 98feac14b1ae298322ee30291105b40ba29dac0b
+Subproject commit 3017f674227ff7a7d915911157cdff62079c3089
diff --git a/platform/android/scripts/configure.sh b/platform/android/scripts/configure.sh
index 2bbc13459..b2bdce556 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 ade9ab2d6..efed96969 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
diff --git a/src/mbgl/util/math.cpp b/src/mbgl/util/math.cpp
index 438b66a02..7b1516c04 100644
--- a/src/mbgl/util/math.cpp
+++ b/src/mbgl/util/math.cpp
@@ -24,7 +24,7 @@ uint32_t ceil_log2(uint64_t x) {
 double log2(double x) {
 // log2() is producing wrong results on ARMv5 binaries
 // running on ARMv7+ CPUs.
-#if defined(__ANDROID__) && defined(__ARM_ARCH_5TE__)
+#if defined(__ANDROID__)
     return std::log(x) / 0.6931471805599453; // log(x) / log(2)
 #else
     return ::log2(x);