From 0db9f229f2bb14e2c6ccd3a8c0d0a30eb25ea5c5 Mon Sep 17 00:00:00 2001
From: John Firebaugh <john.firebaugh@gmail.com>
Date: Fri, 11 Dec 2015 12:22:30 -0800
Subject: [PATCH] [android] Move includes to platform subdirectory

---
 gyp/http-android.gypi                                         | 1 +
 gyp/platform-android.gypi                                     | 1 +
 {include => platform/android/include}/mbgl/android/jni.hpp    | 0
 .../android/include}/mbgl/android/native_map_view.hpp         | 0
 platform/android/mapboxgl-app.gypi                            | 4 ++++
 5 files changed, 6 insertions(+)
 rename {include => platform/android/include}/mbgl/android/jni.hpp (100%)
 rename {include => platform/android/include}/mbgl/android/native_map_view.hpp (100%)

diff --git a/gyp/http-android.gypi b/gyp/http-android.gypi
index 84a44adcb..0a49644e0 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 c9a7d3b6a..73fa264f1 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
similarity index 100%
rename from include/mbgl/android/jni.hpp
rename to 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
similarity index 100%
rename from include/mbgl/android/native_map_view.hpp
rename to platform/android/include/mbgl/android/native_map_view.hpp
diff --git a/platform/android/mapboxgl-app.gypi b/platform/android/mapboxgl-app.gypi
index ced569a4b..4686c79c2 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',