[android] Simplify structure for native files

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',
       ],
 

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',
       ],
 

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': {

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>
 

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>

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>

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>