From 2b782308e5bf0e33f2267499630f25006b451cf7 Mon Sep 17 00:00:00 2001
From: John Firebaugh <john.firebaugh@gmail.com>
Date: Wed, 16 Dec 2015 15:24:37 -0800
Subject: [PATCH] [android] Simplify structure for native files

---
 gyp/http-android.gypi                                      | 3 +--
 gyp/platform-android.gypi                                  | 5 ++---
 platform/android/mapboxgl-app.gypi                         | 7 +++----
 platform/android/{ => src}/asset_root.cpp                  | 2 +-
 platform/android/{ => src}/example_custom_layer.cpp        | 0
 platform/android/{ => src}/http_request_android.cpp        | 2 +-
 platform/android/{ => src}/jni.cpp                         | 5 +++--
 platform/android/{include/mbgl/android => src}/jni.hpp     | 0
 platform/android/{ => src}/log_android.cpp                 | 0
 platform/android/{ => src}/native_map_view.cpp             | 5 +++--
 .../{include/mbgl/android => src}/native_map_view.hpp      | 0
 11 files changed, 14 insertions(+), 15 deletions(-)
 rename platform/android/{ => src}/asset_root.cpp (87%)
 rename platform/android/{ => src}/example_custom_layer.cpp (100%)
 rename platform/android/{ => src}/http_request_android.cpp (99%)
 rename platform/android/{ => src}/jni.cpp (99%)
 rename platform/android/{include/mbgl/android => src}/jni.hpp (100%)
 rename platform/android/{ => src}/log_android.cpp (100%)
 rename platform/android/{ => src}/native_map_view.cpp (99%)
 rename platform/android/{include/mbgl/android => src}/native_map_view.hpp (100%)

diff --git a/gyp/http-android.gypi b/gyp/http-android.gypi
index 0a49644e0..adf4326a0 100644
--- a/gyp/http-android.gypi
+++ b/gyp/http-android.gypi
@@ -7,12 +7,11 @@
       'hard_dependency': 1,
 
       'sources': [
-        '../platform/android/http_request_android.cpp',
+        '../platform/android/src/http_request_android.cpp',
       ],
 
       'include_dirs': [
         '../include',
-        '../platform/android/include',
         '../src',
       ],
 
diff --git a/gyp/platform-android.gypi b/gyp/platform-android.gypi
index 73fa264f1..b66c297c6 100644
--- a/gyp/platform-android.gypi
+++ b/gyp/platform-android.gypi
@@ -10,8 +10,8 @@
       ],
 
       'sources': [
-        '../platform/android/log_android.cpp',
-        '../platform/android/asset_root.cpp',
+        '../platform/android/src/log_android.cpp',
+        '../platform/android/src/asset_root.cpp',
         '../platform/default/async_task.cpp',
         '../platform/default/run_loop.cpp',
         '../platform/default/thread.cpp',
@@ -47,7 +47,6 @@
 
       'include_dirs': [
         '../include',
-        '../platform/android/include',
         '../src',
       ],
 
diff --git a/platform/android/mapboxgl-app.gypi b/platform/android/mapboxgl-app.gypi
index f817cb907..1c2f8f3b3 100644
--- a/platform/android/mapboxgl-app.gypi
+++ b/platform/android/mapboxgl-app.gypi
@@ -17,13 +17,12 @@
       ],
 
       'include_dirs': [
-        './include',
         '../src',
       ],
 
       'sources': [
-        './native_map_view.cpp',
-        './jni.cpp',
+        './src/native_map_view.cpp',
+        './src/jni.cpp',
       ],
 
       'cflags_cc': [
@@ -70,7 +69,7 @@
       'hard_dependency': 1,
 
       'sources': [
-        './example_custom_layer.cpp',
+        './src/example_custom_layer.cpp',
       ],
 
       'variables': {
diff --git a/platform/android/asset_root.cpp b/platform/android/src/asset_root.cpp
similarity index 87%
rename from platform/android/asset_root.cpp
rename to platform/android/src/asset_root.cpp
index 398e18aa1..5720f5731 100644
--- a/platform/android/asset_root.cpp
+++ b/platform/android/src/asset_root.cpp
@@ -1,5 +1,5 @@
 #include <mbgl/platform/platform.hpp>
-#include <mbgl/android/jni.hpp>
+#include "jni.hpp"
 
 #include <libgen.h>
 
diff --git a/platform/android/example_custom_layer.cpp b/platform/android/src/example_custom_layer.cpp
similarity index 100%
rename from platform/android/example_custom_layer.cpp
rename to platform/android/src/example_custom_layer.cpp
diff --git a/platform/android/http_request_android.cpp b/platform/android/src/http_request_android.cpp
similarity index 99%
rename from platform/android/http_request_android.cpp
rename to platform/android/src/http_request_android.cpp
index 1ffdbff3f..03f4f8061 100644
--- a/platform/android/http_request_android.cpp
+++ b/platform/android/src/http_request_android.cpp
@@ -3,7 +3,7 @@
 #include <mbgl/storage/resource.hpp>
 #include <mbgl/storage/response.hpp>
 #include <mbgl/platform/log.hpp>
-#include <mbgl/android/jni.hpp>
+#include "jni.hpp"
 
 #include <mbgl/util/async_task.hpp>
 #include <mbgl/util/time.hpp>
diff --git a/platform/android/jni.cpp b/platform/android/src/jni.cpp
similarity index 99%
rename from platform/android/jni.cpp
rename to platform/android/src/jni.cpp
index fc657a6cb..8555fbf49 100644
--- a/platform/android/jni.cpp
+++ b/platform/android/src/jni.cpp
@@ -13,8 +13,9 @@
 #include <android/native_window_jni.h>
 #include <sys/system_properties.h>
 
-#include <mbgl/android/jni.hpp>
-#include <mbgl/android/native_map_view.hpp>
+#include "jni.hpp"
+#include "native_map_view.hpp"
+
 #include <mbgl/map/map.hpp>
 #include <mbgl/map/camera.hpp>
 #include <mbgl/annotation/point_annotation.hpp>
diff --git a/platform/android/include/mbgl/android/jni.hpp b/platform/android/src/jni.hpp
similarity index 100%
rename from platform/android/include/mbgl/android/jni.hpp
rename to platform/android/src/jni.hpp
diff --git a/platform/android/log_android.cpp b/platform/android/src/log_android.cpp
similarity index 100%
rename from platform/android/log_android.cpp
rename to platform/android/src/log_android.cpp
diff --git a/platform/android/native_map_view.cpp b/platform/android/src/native_map_view.cpp
similarity index 99%
rename from platform/android/native_map_view.cpp
rename to platform/android/src/native_map_view.cpp
index d0c4cdab0..30fdee81b 100644
--- a/platform/android/native_map_view.cpp
+++ b/platform/android/src/native_map_view.cpp
@@ -1,3 +1,6 @@
+#include "native_map_view.hpp"
+#include "jni.hpp"
+
 #include <cstdlib>
 #include <ctime>
 #include <cassert>
@@ -9,8 +12,6 @@
 
 #include <GLES2/gl2.h>
 
-#include <mbgl/android/native_map_view.hpp>
-#include <mbgl/android/jni.hpp>
 #include <mbgl/platform/platform.hpp>
 #include <mbgl/platform/event.hpp>
 #include <mbgl/platform/log.hpp>
diff --git a/platform/android/include/mbgl/android/native_map_view.hpp b/platform/android/src/native_map_view.hpp
similarity index 100%
rename from platform/android/include/mbgl/android/native_map_view.hpp
rename to platform/android/src/native_map_view.hpp