diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2016-02-28 20:30:58 -0800 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2016-03-04 15:33:32 -0800 |
| commit | 9e0be736fcd00ea3275c8e1b8865a55bf72e05de (patch) | |
| tree | 1dbcf565feff5f4c4fd153e4e83deae6333021ad | |
| parent | 55c5c3c8910878cbd1b365467a95f12791306b9d (diff) | |
| download | qtlocation-mapboxgl-9e0be736fcd00ea3275c8e1b8865a55bf72e05de.tar.gz | |
[android] Add jni.hpp headers to build
| -rwxr-xr-x | configure | 3 | ||||
| -rw-r--r-- | gyp/http-android.gypi | 1 | ||||
| -rw-r--r-- | platform/android/mapboxgl-app.gypi | 1 | ||||
| -rw-r--r-- | platform/android/scripts/configure.sh | 1 |
4 files changed, 5 insertions, 1 deletions
@@ -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 index adf4326a07..749e3f2f4d 100644 --- 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 index ecc5ceff04..e372f3b536 100644 --- 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 index 9a4f0eb92a..81bdf19e98 100644 --- 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} |