[ios, osx] Consolidate remaining files in platform/{ios,osx}

4 files changed, 53 insertions, 53 deletions

diff --git a/gyp/http-nsurl.gypi b/gyp/http-nsurl.gypi
index af15520c56..9c212ee7c0 100644
--- a/gyp/http-nsurl.gypi
+++ b/gyp/http-nsurl.gypi
@@ -7,7 +7,7 @@
       'hard_dependency': 1,
 
       'sources': [
-        '../platform/darwin/http_request_nsurl.mm',
+        '../platform/darwin/src/http_request_nsurl.mm',
       ],
 
       'include_dirs': [
diff --git a/gyp/ios.gyp b/gyp/ios.gyp
index e015318c45..6798384ef4 100644
--- a/gyp/ios.gyp
+++ b/gyp/ios.gyp
@@ -1,7 +1,7 @@
 {
   'includes': [
-    '../ios/app/mapboxgl-app.gypi',
-    '../ios/framework/framework-ios.gypi',
-    '../ios/benchmark/benchmark-ios.gypi',
+    '../platform/ios/app/mapboxgl-app.gypi',
+    '../platform/ios/framework/framework-ios.gypi',
+    '../platform/ios/benchmark/benchmark-ios.gypi',
   ],
 }
diff --git a/gyp/platform-ios.gypi b/gyp/platform-ios.gypi
index b166286af7..e33c3d453d 100644
--- a/gyp/platform-ios.gypi
+++ b/gyp/platform-ios.gypi
@@ -24,26 +24,26 @@
         '../platform/default/mbgl/storage/offline_download.cpp',
         '../platform/default/sqlite3.hpp',
         '../platform/default/sqlite3.cpp',
-        '../platform/darwin/log_nslog.mm',
-        '../platform/darwin/string_nsstring.mm',
-        '../platform/darwin/application_root.mm',
-        '../platform/darwin/image.mm',
-        '../platform/darwin/nsthread.mm',
-        '../platform/darwin/reachability.m',
-        '../platform/darwin/NSException+MGLAdditions.h',
-        '../platform/darwin/NSString+MGLAdditions.h',
-        '../platform/darwin/NSString+MGLAdditions.m',
-        '../platform/darwin/MGLTypes.m',
-        '../platform/darwin/MGLStyle.mm',
-        '../platform/darwin/MGLGeometry_Private.h',
-        '../platform/darwin/MGLGeometry.mm',
-        '../platform/darwin/MGLShape.m',
-        '../platform/darwin/MGLMultiPoint_Private.h',
-        '../platform/darwin/MGLMultiPoint.mm',
-        '../platform/darwin/MGLPointAnnotation.m',
-        '../platform/darwin/MGLPolyline.mm',
-        '../platform/darwin/MGLPolygon.mm',
-        '../platform/darwin/MGLMapCamera.mm',
+        '../platform/darwin/src/log_nslog.mm',
+        '../platform/darwin/src/string_nsstring.mm',
+        '../platform/darwin/src/application_root.mm',
+        '../platform/darwin/src/image.mm',
+        '../platform/darwin/src/nsthread.mm',
+        '../platform/darwin/src/reachability.m',
+        '../platform/darwin/src/NSException+MGLAdditions.h',
+        '../platform/darwin/src/NSString+MGLAdditions.h',
+        '../platform/darwin/src/NSString+MGLAdditions.m',
+        '../platform/darwin/src/MGLTypes.m',
+        '../platform/darwin/src/MGLStyle.mm',
+        '../platform/darwin/src/MGLGeometry_Private.h',
+        '../platform/darwin/src/MGLGeometry.mm',
+        '../platform/darwin/src/MGLShape.m',
+        '../platform/darwin/src/MGLMultiPoint_Private.h',
+        '../platform/darwin/src/MGLMultiPoint.mm',
+        '../platform/darwin/src/MGLPointAnnotation.m',
+        '../platform/darwin/src/MGLPolyline.mm',
+        '../platform/darwin/src/MGLPolygon.mm',
+        '../platform/darwin/src/MGLMapCamera.mm',
         '../platform/ios/src/MGLMapboxEvents.h',
         '../platform/ios/src/MGLMapboxEvents.m',
         '../platform/ios/src/MGLMapView.mm',
@@ -55,7 +55,7 @@
         '../platform/ios/src/MGLUserLocationAnnotationView.m',
         '../platform/ios/src/MGLAnnotationImage_Private.h',
         '../platform/ios/src/MGLAnnotationImage.m',
-        '../include/mbgl/ios/MGLCalloutView.h',
+        '../platform/ios/include/MGLCalloutView.h',
         '../platform/ios/src/MGLCompactCalloutView.h',
         '../platform/ios/src/MGLCompactCalloutView.m',
         '../platform/ios/src/NSBundle+MGLAdditions.h',
@@ -100,8 +100,8 @@
       },
 
       'include_dirs': [
-        '../include/mbgl/ios',
-        '../include/mbgl/darwin',
+        '../platform/ios/include',
+        '../platform/darwin/include',
         '../include',
         '../src',
         '../platform/default',
@@ -122,8 +122,8 @@
 
       'direct_dependent_settings': {
         'include_dirs': [
-          '../include/mbgl/ios',
-          '../include/mbgl/darwin',
+          '../platform/ios/include',
+          '../platform/darwin/include',
           '../include',
         ],
         'mac_bundle_resources': [
diff --git a/gyp/platform-osx.gypi b/gyp/platform-osx.gypi
index 970fd1b5f6..804a4cd9a6 100644
--- a/gyp/platform-osx.gypi
+++ b/gyp/platform-osx.gypi
@@ -23,26 +23,26 @@
         '../platform/default/mbgl/storage/offline_download.cpp',
         '../platform/default/sqlite3.hpp',
         '../platform/default/sqlite3.cpp',
-        '../platform/darwin/log_nslog.mm',
-        '../platform/darwin/string_nsstring.mm',
-        '../platform/darwin/application_root.mm',
-        '../platform/darwin/image.mm',
-        '../platform/darwin/nsthread.mm',
-        '../platform/darwin/reachability.m',
-        '../platform/darwin/NSException+MGLAdditions.h',
-        '../platform/darwin/NSString+MGLAdditions.h',
-        '../platform/darwin/NSString+MGLAdditions.m',
-        '../platform/darwin/MGLTypes.m',
-        '../platform/darwin/MGLStyle.mm',
-        '../platform/darwin/MGLGeometry_Private.h',
-        '../platform/darwin/MGLGeometry.mm',
-        '../platform/darwin/MGLShape.m',
-        '../platform/darwin/MGLMultiPoint_Private.h',
-        '../platform/darwin/MGLMultiPoint.mm',
-        '../platform/darwin/MGLPointAnnotation.m',
-        '../platform/darwin/MGLPolyline.mm',
-        '../platform/darwin/MGLPolygon.mm',
-        '../platform/darwin/MGLMapCamera.mm',
+        '../platform/darwin/src/log_nslog.mm',
+        '../platform/darwin/src/string_nsstring.mm',
+        '../platform/darwin/src/application_root.mm',
+        '../platform/darwin/src/image.mm',
+        '../platform/darwin/src/nsthread.mm',
+        '../platform/darwin/src/reachability.m',
+        '../platform/darwin/src/NSException+MGLAdditions.h',
+        '../platform/darwin/src/NSString+MGLAdditions.h',
+        '../platform/darwin/src/NSString+MGLAdditions.m',
+        '../platform/darwin/src/MGLTypes.m',
+        '../platform/darwin/src/MGLStyle.mm',
+        '../platform/darwin/src/MGLGeometry_Private.h',
+        '../platform/darwin/src/MGLGeometry.mm',
+        '../platform/darwin/src/MGLShape.m',
+        '../platform/darwin/src/MGLMultiPoint_Private.h',
+        '../platform/darwin/src/MGLMultiPoint.mm',
+        '../platform/darwin/src/MGLPointAnnotation.m',
+        '../platform/darwin/src/MGLPolyline.mm',
+        '../platform/darwin/src/MGLPolygon.mm',
+        '../platform/darwin/src/MGLMapCamera.mm',
         '../platform/osx/src/MGLAccountManager_Private.h',
         '../platform/osx/src/MGLAccountManager.m',
         '../platform/osx/src/MGLMapView_Private.h',
@@ -85,8 +85,8 @@
       },
 
       'include_dirs': [
-        '../include/mbgl/osx',
-        '../include/mbgl/darwin',
+        '../platform/osx/include',
+        '../platform/darwin/include',
         '../include',
         '../src',
         '../platform/default',
@@ -107,8 +107,8 @@
 
       'direct_dependent_settings': {
         'include_dirs': [
-          '../include/mbgl/osx',
-          '../include/mbgl/darwin',
+          '../platform/osx/include',
+          '../platform/darwin/include',
           '../include',
         ],
         'mac_bundle_resources': [