[android] Add jni.hpp headers to build

tssmits · Mar 4, 2016 · 9e0be73 · 9e0be73
1 parent 55c5c3c
commit 9e0be73
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 1 deletion.
diff --git a/configure b/configure
@@ -32,7 +32,7 @@ function print_flags {
     if [ "$(type -t print_${NAME}_flags)" = 'function' ]; then
         print_${NAME}_flags
     else
-        local VERSION=`echo "${NAME}_VERSION" | tr "[:lower:]-" "[:upper:]_"`
+        local VERSION=`echo "${NAME}_VERSION" | tr "[:lower:]-." "[:upper:]__"`
         if [ ! -z ${!VERSION:-} ] ; then
             mason install ${NAME} ${!VERSION}
             for FLAGS in "$@" ; do
@@ -106,6 +106,7 @@ print_flags rapidjson static_libs cflags ldflags
 print_flags gtest static_libs cflags ldflags
 print_flags pixelmatch static_libs cflags ldflags
 print_flags webp static_libs cflags ldflags
+print_flags jni.hpp static_libs cflags ldflags
 
 CONFIG+="  }
 }

diff --git a/gyp/http-android.gypi b/gyp/http-android.gypi
@@ -18,6 +18,7 @@
       'variables': {
         'cflags_cc': [
           '<@(boost_cflags)',
+          '<@(jni.hpp_cflags)',
         ],
         'defines': [
           '-DMBGL_HTTP_ANDROID'

diff --git a/platform/android/mapboxgl-app.gypi b/platform/android/mapboxgl-app.gypi
@@ -27,6 +27,7 @@
       'cflags_cc': [
         '<@(boost_cflags)',
         '<@(variant_cflags)',
+        '<@(jni.hpp_cflags)',
       ],
       'libraries': [
           '<@(libpng_static_libs)',

diff --git a/platform/android/scripts/configure.sh b/platform/android/scripts/configure.sh
@@ -11,5 +11,6 @@ LIBZIP_VERSION=0.11.2
 GEOJSONVT_VERSION=3.1.0
 VARIANT_VERSION=1.0
 RAPIDJSON_VERSION=1.0.2
+JNI_HPP_VERSION=2.0.0
 
 export MASON_ANDROID_ABI=${MASON_PLATFORM_VERSION}