diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2015-12-11 12:22:30 -0800 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2015-12-16 14:52:29 -0800 |
| commit | 0db9f229f2bb14e2c6ccd3a8c0d0a30eb25ea5c5 (patch) | |
| tree | e4172846b4aa5d0c72e2c7860d7ac5b4a8286a98 | |
| parent | c23e8cc748d0a74d23a07ff8cfc58ade797a903d (diff) | |
| download | qtlocation-mapboxgl-0db9f229f2bb14e2c6ccd3a8c0d0a30eb25ea5c5.tar.gz | |
[android] Move includes to platform subdirectory
| -rw-r--r-- | gyp/http-android.gypi | 1 | ||||
| -rw-r--r-- | gyp/platform-android.gypi | 1 | ||||
| -rw-r--r-- | platform/android/include/mbgl/android/jni.hpp (renamed from include/mbgl/android/jni.hpp) | 0 | ||||
| -rw-r--r-- | platform/android/include/mbgl/android/native_map_view.hpp (renamed from include/mbgl/android/native_map_view.hpp) | 0 | ||||
| -rw-r--r-- | platform/android/mapboxgl-app.gypi | 4 |
5 files changed, 6 insertions, 0 deletions
diff --git a/gyp/http-android.gypi b/gyp/http-android.gypi index 84a44adcbc..0a49644e09 100644 --- a/gyp/http-android.gypi +++ b/gyp/http-android.gypi @@ -12,6 +12,7 @@ 'include_dirs': [ '../include', + '../platform/android/include', '../src', ], diff --git a/gyp/platform-android.gypi b/gyp/platform-android.gypi index c9a7d3b6a0..73fa264f1d 100644 --- a/gyp/platform-android.gypi +++ b/gyp/platform-android.gypi @@ -47,6 +47,7 @@ 'include_dirs': [ '../include', + '../platform/android/include', '../src', ], diff --git a/include/mbgl/android/jni.hpp b/platform/android/include/mbgl/android/jni.hpp index 06b9d781c7..06b9d781c7 100644 --- a/include/mbgl/android/jni.hpp +++ b/platform/android/include/mbgl/android/jni.hpp diff --git a/include/mbgl/android/native_map_view.hpp b/platform/android/include/mbgl/android/native_map_view.hpp index 7b5473d48c..7b5473d48c 100644 --- a/include/mbgl/android/native_map_view.hpp +++ b/platform/android/include/mbgl/android/native_map_view.hpp diff --git a/platform/android/mapboxgl-app.gypi b/platform/android/mapboxgl-app.gypi index ced569a4bc..4686c79c2f 100644 --- a/platform/android/mapboxgl-app.gypi +++ b/platform/android/mapboxgl-app.gypi @@ -16,6 +16,10 @@ 'mbgl.gyp:cache-<(cache_lib)', ], + 'include_dirs': [ + './include', + ], + 'sources': [ './native_map_view.cpp', './jni.cpp', |