From 13d5b18ebaeb330f05c4abfc04e0247222e038ba Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Fri, 11 Dec 2015 12:39:43 -0800 Subject: [PATCH] [android] Move into platform subdirectory --- .gitignore | 10 +++++----- Makefile | 12 ++++++++---- docs/DEVELOP_ANDROID_OSX.md | 4 ++-- {android => platform/android}/.gitignore | 0 .../android}/MapboxGLAndroidSDK/build.gradle | 0 .../android}/MapboxGLAndroidSDK/deploy.sh | 0 .../android}/MapboxGLAndroidSDK/gradle.properties | 0 .../android}/MapboxGLAndroidSDK/lint.xml | 0 .../android}/MapboxGLAndroidSDK/proguard-rules.pro | 0 .../MapboxGLAndroidSDK/src/main/AndroidManifest.xml | 0 .../gesturedetectors/BaseGestureDetector.java | 0 .../gesturedetectors/MoveGestureDetector.java | 0 .../gesturedetectors/RotateGestureDetector.java | 0 .../gesturedetectors/ShoveGestureDetector.java | 0 .../gesturedetectors/TwoFingerGestureDetector.java | 0 .../multitouch/gesturedetectors/package-info.java | 0 .../main/java/com/mapbox/mapboxsdk/MapFragment.java | 0 .../mapbox/mapboxsdk/annotations/Annotation.java | 0 .../mapbox/mapboxsdk/annotations/InfoWindow.java | 0 .../mapboxsdk/annotations/InfoWindowTipView.java | 0 .../mapboxsdk/annotations/InfoWindowView.java | 0 .../com/mapbox/mapboxsdk/annotations/Marker.java | 0 .../mapbox/mapboxsdk/annotations/MarkerOptions.java | 0 .../mapbox/mapboxsdk/annotations/MultiPoint.java | 0 .../com/mapbox/mapboxsdk/annotations/Polygon.java | 0 .../mapboxsdk/annotations/PolygonOptions.java | 0 .../com/mapbox/mapboxsdk/annotations/Polyline.java | 0 .../mapboxsdk/annotations/PolylineOptions.java | 0 .../com/mapbox/mapboxsdk/annotations/Sprite.java | 0 .../mapbox/mapboxsdk/annotations/SpriteFactory.java | 0 .../mapbox/mapboxsdk/annotations/package-info.java | 0 .../mapbox/mapboxsdk/constants/GeoConstants.java | 0 .../mapbox/mapboxsdk/constants/MapboxConstants.java | 0 .../mapbox/mapboxsdk/constants/MathConstants.java | 0 .../mapboxsdk/constants/MyBearingTracking.java | 0 .../mapboxsdk/constants/MyLocationTracking.java | 0 .../java/com/mapbox/mapboxsdk/constants/Style.java | 0 .../mapbox/mapboxsdk/constants/package-info.java | 0 .../exceptions/InvalidAccessTokenException.java | 0 .../exceptions/SpriteBitmapChangedException.java | 0 .../exceptions/TooManySpritesException.java | 0 .../mapbox/mapboxsdk/exceptions/package-info.java | 0 .../com/mapbox/mapboxsdk/geometry/BoundingBox.java | 0 .../mapbox/mapboxsdk/geometry/CoordinateBounds.java | 0 .../mapbox/mapboxsdk/geometry/CoordinateRegion.java | 0 .../mapbox/mapboxsdk/geometry/CoordinateSpan.java | 0 .../java/com/mapbox/mapboxsdk/geometry/ILatLng.java | 0 .../mapbox/mapboxsdk/geometry/IProjectedMeters.java | 0 .../java/com/mapbox/mapboxsdk/geometry/LatLng.java | 0 .../com/mapbox/mapboxsdk/geometry/LatLngZoom.java | 0 .../mapbox/mapboxsdk/geometry/ProjectedMeters.java | 0 .../com/mapbox/mapboxsdk/geometry/package-info.java | 0 .../java/com/mapbox/mapboxsdk/http/HTTPContext.java | 0 .../com/mapbox/mapboxsdk/http/package-info.java | 0 .../com/mapbox/mapboxsdk/layers/CustomLayer.java | 0 .../com/mapbox/mapboxsdk/layers/package-info.java | 0 .../mapbox/mapboxsdk/location/LocationListener.java | 0 .../mapbox/mapboxsdk/location/LocationServices.java | 0 .../java/com/mapbox/mapboxsdk/package-info.java | 0 .../java/com/mapbox/mapboxsdk/utils/ApiAccess.java | 0 .../com/mapbox/mapboxsdk/utils/package-info.java | 0 .../com/mapbox/mapboxsdk/views/CompassView.java | 0 .../java/com/mapbox/mapboxsdk/views/MapView.java | 0 .../com/mapbox/mapboxsdk/views/NativeMapView.java | 0 .../mapbox/mapboxsdk/views/UserLocationView.java | 0 .../com/mapbox/mapboxsdk/views/package-info.java | 0 .../MapboxGLAndroidSDK/src/main/java/overview.html | 0 .../src/main/res-public/values/public.xml | 0 .../src/main/res/color/material_bg_selector.xml | 0 .../src/main/res/drawable-hdpi/attribution_logo.png | Bin .../src/main/res/drawable-hdpi/compass.png | Bin .../src/main/res/drawable-hdpi/default_marker.png | Bin .../src/main/res/drawable-hdpi/my_location.png | Bin .../main/res/drawable-hdpi/my_location_bearing.png | Bin .../main/res/drawable-hdpi/my_location_stale.png | Bin .../src/main/res/drawable-mdpi/attribution_logo.png | Bin .../src/main/res/drawable-mdpi/compass.png | Bin .../src/main/res/drawable-mdpi/default_marker.png | Bin .../src/main/res/drawable-mdpi/my_location.png | Bin .../main/res/drawable-mdpi/my_location_bearing.png | Bin .../main/res/drawable-mdpi/my_location_stale.png | Bin .../main/res/drawable-v21/bg_default_selector.xml | 0 .../main/res/drawable-xhdpi/attribution_logo.png | Bin .../src/main/res/drawable-xhdpi/compass.png | Bin .../src/main/res/drawable-xhdpi/default_marker.png | Bin .../src/main/res/drawable-xhdpi/my_location.png | Bin .../main/res/drawable-xhdpi/my_location_bearing.png | Bin .../main/res/drawable-xhdpi/my_location_stale.png | Bin .../main/res/drawable-xxhdpi/attribution_logo.png | Bin .../src/main/res/drawable-xxhdpi/compass.png | Bin .../src/main/res/drawable-xxhdpi/default_marker.png | Bin .../src/main/res/drawable-xxhdpi/my_location.png | Bin .../res/drawable-xxhdpi/my_location_bearing.png | Bin .../main/res/drawable-xxhdpi/my_location_stale.png | Bin .../main/res/drawable-xxxhdpi/attribution_logo.png | Bin .../drawable-xxxhdpi/bg_infowindow_content.9.png | Bin .../src/main/res/drawable-xxxhdpi/compass.png | Bin .../main/res/drawable-xxxhdpi/default_marker.png | Bin .../src/main/res/drawable-xxxhdpi/my_location.png | Bin .../res/drawable-xxxhdpi/my_location_bearing.png | Bin .../main/res/drawable-xxxhdpi/my_location_stale.png | Bin .../src/main/res/drawable/bg_default_selector.xml | 0 .../src/main/res/drawable/ic_info_outline_24dp.xml | 0 .../res/drawable/ic_info_outline_24dp_selected.xml | 0 .../res/drawable/ic_info_outline_24dp_selector.xml | 0 .../src/main/res/layout/attribution_list_item.xml | 0 .../src/main/res/layout/fragment_mapview.xml | 0 .../src/main/res/layout/infowindow_content.xml | 0 .../src/main/res/layout/infowindow_view.xml | 0 .../src/main/res/layout/mapview_internal.xml | 0 .../src/main/res/values/arrays.xml | 0 .../src/main/res/values/attrs.xml | 0 .../src/main/res/values/colors.xml | 0 .../src/main/res/values/dimens.xml | 0 .../src/main/res/values/strings.xml | 0 .../src/main/res/values/styles.xml | 0 ...m.mapbox.mapboxsdk.mapbox-android-sdk.properties | 0 .../android}/MapboxGLAndroidSDKTestApp/README.md | 0 .../android}/MapboxGLAndroidSDKTestApp/build.gradle | 0 .../android}/MapboxGLAndroidSDKTestApp/lint.xml | 0 .../MapboxGLAndroidSDKTestApp/proguard-rules.pro | 0 .../java/com/mapbox/mapboxsdk/testapp/BaseTest.java | 0 .../mapboxsdk/testapp/BulkMarkerActivityTest.java | 0 .../mapboxsdk/testapp/InfoWindowActivityTest.java | 0 .../testapp/InfoWindowAdapterActivityTest.java | 0 .../mapboxsdk/testapp/MainActivityScreenTest.java | 0 .../mapbox/mapboxsdk/testapp/MainActivityTest.java | 0 .../mapboxsdk/testapp/MapFragmentActivityTest.java | 0 .../testapp/MyLocationTrackingModeActivityTest.java | 0 .../mapboxsdk/testapp/PolylineActivityTest.java | 0 .../testapp/PressForMarkerActivityTest.java | 0 .../mapbox/mapboxsdk/testapp/TiltActivityTest.java | 0 .../VisibleCoordinateBoundsActivityTest.java | 0 .../mapboxsdk/testapp/utils/ScreenshotUtil.java | 0 .../src/main/AndroidManifest.xml | 0 .../src/main/assets/dog-park-24.png | Bin .../src/main/assets/points.geojson | 0 .../src/main/assets/small_line.geojson | 0 .../src/main/assets/small_poly.geojson | 0 .../mapboxsdk/testapp/BulkMarkerActivity.java | 0 .../mapboxsdk/testapp/CoordinateChangeActivity.java | 0 .../mapboxsdk/testapp/ExampleCustomLayer.java | 0 .../mapboxsdk/testapp/InfoWindowActivity.java | 0 .../testapp/InfoWindowAdapterActivity.java | 0 .../testapp/InfoWindowConcurrentActivity.java | 0 .../com/mapbox/mapboxsdk/testapp/MainActivity.java | 0 .../mapboxsdk/testapp/ManualZoomActivity.java | 0 .../mapboxsdk/testapp/MapFragmentActivity.java | 0 .../testapp/MyLocationTrackingModeActivity.java | 0 .../mapbox/mapboxsdk/testapp/PolylineActivity.java | 0 .../mapboxsdk/testapp/PressForMarkerActivity.java | 0 .../com/mapbox/mapboxsdk/testapp/TiltActivity.java | 0 .../testapp/VisibleCoordinateBoundsActivity.java | 0 .../mapboxsdk/testapp/utils/GeoParseUtil.java | 0 .../mapboxsdk/testapp/utils/TimingLogger.java | 0 .../src/main/res/drawable-hdpi/icon.png | Bin .../src/main/res/drawable-hdpi/icon_burned.png | Bin .../src/main/res/drawable-mdpi/icon.png | Bin .../src/main/res/drawable-mdpi/icon_burned.png | Bin .../src/main/res/drawable-xhdpi/icon.png | Bin .../src/main/res/drawable-xhdpi/icon_burned.png | Bin .../src/main/res/drawable-xxhdpi/icon.png | Bin .../src/main/res/drawable-xxhdpi/icon_burned.png | Bin .../src/main/res/drawable-xxxhdpi/icon.png | Bin .../src/main/res/drawable-xxxhdpi/icon_burned.png | Bin .../src/main/res/drawable/ic_add_24dp.xml | 0 .../main/res/drawable/ic_animate_coordinates.xml | 0 .../src/main/res/drawable/ic_blur_on_24dp.xml | 0 .../src/main/res/drawable/ic_bug_report_24dp.xml | 0 .../src/main/res/drawable/ic_crop_24dp.xml | 0 .../src/main/res/drawable/ic_delete_24dp.xml | 0 .../res/drawable/ic_filter_center_focus_24dp.xml | 0 .../src/main/res/drawable/ic_filter_none_24dp.xml | 0 .../src/main/res/drawable/ic_flip_to_back_24dp.xml | 0 .../src/main/res/drawable/ic_flip_to_front_24dp.xml | 0 .../src/main/res/drawable/ic_gps_fixed_24dp.xml | 0 .../src/main/res/drawable/ic_infowindow_adapter.xml | 0 .../main/res/drawable/ic_infowindow_concurrent.xml | 0 .../src/main/res/drawable/ic_location_city_24dp.xml | 0 .../src/main/res/drawable/ic_menu_24dp.xml | 0 .../src/main/res/drawable/ic_navigation_24dp.xml | 0 .../src/main/res/drawable/ic_now_widgets_24dp.xml | 0 .../src/main/res/drawable/ic_pin_drop_24dp.xml | 0 .../src/main/res/drawable/ic_place_24dp.xml | 0 .../src/main/res/drawable/ic_tilt.xml | 0 .../src/main/res/drawable/ic_trending_up_24dp.xml | 0 .../main/res/layout/activity_animate_coordinate.xml | 0 .../src/main/res/layout/activity_infowindow.xml | 0 .../main/res/layout/activity_infowindow_adapter.xml | 0 .../res/layout/activity_infowindow_concurrent.xml | 0 .../src/main/res/layout/activity_main.xml | 0 .../src/main/res/layout/activity_manual_zoom.xml | 0 .../src/main/res/layout/activity_map_fragment.xml | 0 .../src/main/res/layout/activity_marker_bulk.xml | 0 .../res/layout/activity_my_location_tracking.xml | 0 .../src/main/res/layout/activity_polyline.xml | 0 .../main/res/layout/activity_press_for_marker.xml | 0 .../src/main/res/layout/activity_tilt.xml | 0 .../src/main/res/layout/activity_visible_bounds.xml | 0 .../src/main/res/menu/menu_drawer.xml | 0 .../src/main/res/menu/menu_main.xml | 0 .../src/main/res/menu/menu_polyline.xml | 0 .../src/main/res/values/colors.xml | 0 .../src/main/res/values/dimens.xml | 0 .../src/main/res/values/strings.xml | 0 .../src/main/res/values/styles.xml | 0 .../src/test/java/BoundingBoxTest.java | 0 .../src/test/java/CoordinateBoundsTest.java | 0 .../src/test/java/CoordinateRegionTest.java | 0 .../src/test/java/CoordinateSpanTest.java | 0 .../src/test/java/LatLngTest.java | 0 .../src/test/java/LatLngZoomTest.java | 0 .../src/test/java/MarkerTest.java | 0 .../src/test/java/PolygonTest.java | 0 .../src/test/java/PolylineTest.java | 0 .../src/test/java/ProjectedMetersTest.java | 0 platform/android/bitrise.yml | 8 ++++---- {android => platform/android}/build.gradle | 0 {android => platform/android}/checks.xml | 0 .../android}/gradle/wrapper/gradle-wrapper.jar | Bin .../gradle/wrapper/gradle-wrapper.properties | 0 {android => platform/android}/gradlew | 0 {android => platform/android}/gradlew.bat | 0 platform/android/mapboxgl-app.gypi | 9 +++++---- {android => platform/android}/settings.gradle | 0 scripts/android/run.sh | 6 +++--- update_icons.sh | 2 +- 227 files changed, 28 insertions(+), 23 deletions(-) rename {android => platform/android}/.gitignore (100%) rename {android => platform/android}/MapboxGLAndroidSDK/build.gradle (100%) rename {android => platform/android}/MapboxGLAndroidSDK/deploy.sh (100%) rename {android => platform/android}/MapboxGLAndroidSDK/gradle.properties (100%) rename {android => platform/android}/MapboxGLAndroidSDK/lint.xml (100%) rename {android => platform/android}/MapboxGLAndroidSDK/proguard-rules.pro (100%) rename {android => platform/android}/MapboxGLAndroidSDK/src/main/AndroidManifest.xml (100%) rename {android => platform/android}/MapboxGLAndroidSDK/src/main/java/com/almeros/android/multitouch/gesturedetectors/BaseGestureDetector.java (100%) rename {android => platform/android}/MapboxGLAndroidSDK/src/main/java/com/almeros/android/multitouch/gesturedetectors/MoveGestureDetector.java (100%) rename {android => platform/android}/MapboxGLAndroidSDK/src/main/java/com/almeros/android/multitouch/gesturedetectors/RotateGestureDetector.java (100%) rename {android => platform/android}/MapboxGLAndroidSDK/src/main/java/com/almeros/android/multitouch/gesturedetectors/ShoveGestureDetector.java (100%) rename {android => platform/android}/MapboxGLAndroidSDK/src/main/java/com/almeros/android/multitouch/gesturedetectors/TwoFingerGestureDetector.java (100%) rename {android => platform/android}/MapboxGLAndroidSDK/src/main/java/com/almeros/android/multitouch/gesturedetectors/package-info.java (100%) rename {android => platform/android}/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/MapFragment.java (100%) rename {android => platform/android}/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Annotation.java (100%) rename {android => platform/android}/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/InfoWindow.java (100%) rename {android => platform/android}/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/InfoWindowTipView.java (100%) rename {android => platform/android}/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/InfoWindowView.java (100%) rename {android => platform/android}/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Marker.java (100%) rename {android => platform/android}/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerOptions.java (100%) rename {android => platform/android}/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MultiPoint.java (100%) rename {android => platform/android}/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Polygon.java (100%) rename {android => platform/android}/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/PolygonOptions.java (100%) rename {android => platform/android}/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Polyline.java (100%) rename {android => platform/android}/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/PolylineOptions.java (100%) rename {android => platform/android}/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Sprite.java (100%) rename {android => platform/android}/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/SpriteFactory.java (100%) rename {android => platform/android}/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/package-info.java (100%) rename {android => platform/android}/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/GeoConstants.java (100%) rename {android => platform/android}/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/MapboxConstants.java (100%) rename {android => platform/android}/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/MathConstants.java (100%) rename {android => platform/android}/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/MyBearingTracking.java (100%) rename {android => platform/android}/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/MyLocationTracking.java (100%) rename {android => platform/android}/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/Style.java (100%) rename {android => platform/android}/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/package-info.java (100%) rename {android => platform/android}/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/exceptions/InvalidAccessTokenException.java (100%) rename {android => platform/android}/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/exceptions/SpriteBitmapChangedException.java (100%) rename {android => platform/android}/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/exceptions/TooManySpritesException.java (100%) rename {android => platform/android}/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/exceptions/package-info.java (100%) rename {android => platform/android}/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/BoundingBox.java (100%) rename {android => platform/android}/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/CoordinateBounds.java (100%) rename {android => platform/android}/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/CoordinateRegion.java (100%) rename {android => platform/android}/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/CoordinateSpan.java (100%) rename {android => platform/android}/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/ILatLng.java (100%) rename {android => platform/android}/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/IProjectedMeters.java (100%) rename {android => platform/android}/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/LatLng.java (100%) rename {android => platform/android}/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/LatLngZoom.java (100%) rename {android => platform/android}/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/ProjectedMeters.java (100%) rename {android => platform/android}/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/package-info.java (100%) rename {android => platform/android}/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/HTTPContext.java (100%) rename {android => platform/android}/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/package-info.java (100%) rename {android => platform/android}/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/layers/CustomLayer.java (100%) rename {android => platform/android}/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/layers/package-info.java (100%) rename {android => platform/android}/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationListener.java (100%) rename {android => platform/android}/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationServices.java (100%) rename {android => platform/android}/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/package-info.java (100%) rename {android => platform/android}/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/ApiAccess.java (100%) rename {android => platform/android}/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/package-info.java (100%) rename {android => platform/android}/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/CompassView.java (100%) rename {android => platform/android}/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/MapView.java (100%) rename {android => platform/android}/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/NativeMapView.java (100%) rename {android => platform/android}/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/UserLocationView.java (100%) rename {android => platform/android}/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/package-info.java (100%) rename {android => platform/android}/MapboxGLAndroidSDK/src/main/java/overview.html (100%) rename {android => platform/android}/MapboxGLAndroidSDK/src/main/res-public/values/public.xml (100%) rename {android => platform/android}/MapboxGLAndroidSDK/src/main/res/color/material_bg_selector.xml (100%) rename {android => platform/android}/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/attribution_logo.png (100%) rename {android => platform/android}/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/compass.png (100%) rename {android => platform/android}/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/default_marker.png (100%) rename {android => platform/android}/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/my_location.png (100%) rename {android => platform/android}/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/my_location_bearing.png (100%) rename {android => platform/android}/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/my_location_stale.png (100%) rename {android => platform/android}/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/attribution_logo.png (100%) rename {android => platform/android}/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/compass.png (100%) rename {android => platform/android}/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/default_marker.png (100%) rename {android => platform/android}/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/my_location.png (100%) rename {android => platform/android}/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/my_location_bearing.png (100%) rename {android => platform/android}/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/my_location_stale.png (100%) rename {android => platform/android}/MapboxGLAndroidSDK/src/main/res/drawable-v21/bg_default_selector.xml (100%) rename {android => platform/android}/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/attribution_logo.png (100%) rename {android => platform/android}/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/compass.png (100%) rename {android => platform/android}/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/default_marker.png (100%) rename {android => platform/android}/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/my_location.png (100%) rename {android => platform/android}/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/my_location_bearing.png (100%) rename {android => platform/android}/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/my_location_stale.png (100%) rename {android => platform/android}/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/attribution_logo.png (100%) rename {android => platform/android}/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/compass.png (100%) rename {android => platform/android}/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/default_marker.png (100%) rename {android => platform/android}/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/my_location.png (100%) rename {android => platform/android}/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/my_location_bearing.png (100%) rename {android => platform/android}/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/my_location_stale.png (100%) rename {android => platform/android}/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/attribution_logo.png (100%) rename {android => platform/android}/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/bg_infowindow_content.9.png (100%) rename {android => platform/android}/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/compass.png (100%) rename {android => platform/android}/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/default_marker.png (100%) rename {android => platform/android}/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/my_location.png (100%) rename {android => platform/android}/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/my_location_bearing.png (100%) rename {android => platform/android}/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/my_location_stale.png (100%) rename {android => platform/android}/MapboxGLAndroidSDK/src/main/res/drawable/bg_default_selector.xml (100%) rename {android => platform/android}/MapboxGLAndroidSDK/src/main/res/drawable/ic_info_outline_24dp.xml (100%) rename {android => platform/android}/MapboxGLAndroidSDK/src/main/res/drawable/ic_info_outline_24dp_selected.xml (100%) rename {android => platform/android}/MapboxGLAndroidSDK/src/main/res/drawable/ic_info_outline_24dp_selector.xml (100%) rename {android => platform/android}/MapboxGLAndroidSDK/src/main/res/layout/attribution_list_item.xml (100%) rename {android => platform/android}/MapboxGLAndroidSDK/src/main/res/layout/fragment_mapview.xml (100%) rename {android => platform/android}/MapboxGLAndroidSDK/src/main/res/layout/infowindow_content.xml (100%) rename {android => platform/android}/MapboxGLAndroidSDK/src/main/res/layout/infowindow_view.xml (100%) rename {android => platform/android}/MapboxGLAndroidSDK/src/main/res/layout/mapview_internal.xml (100%) rename {android => platform/android}/MapboxGLAndroidSDK/src/main/res/values/arrays.xml (100%) rename {android => platform/android}/MapboxGLAndroidSDK/src/main/res/values/attrs.xml (100%) rename {android => platform/android}/MapboxGLAndroidSDK/src/main/res/values/colors.xml (100%) rename {android => platform/android}/MapboxGLAndroidSDK/src/main/res/values/dimens.xml (100%) rename {android => platform/android}/MapboxGLAndroidSDK/src/main/res/values/strings.xml (100%) rename {android => platform/android}/MapboxGLAndroidSDK/src/main/res/values/styles.xml (100%) rename {android => platform/android}/MapboxGLAndroidSDK/src/main/resources/fabric/com.mapbox.mapboxsdk.mapbox-android-sdk.properties (100%) rename {android => platform/android}/MapboxGLAndroidSDKTestApp/README.md (100%) rename {android => platform/android}/MapboxGLAndroidSDKTestApp/build.gradle (100%) rename {android => platform/android}/MapboxGLAndroidSDKTestApp/lint.xml (100%) rename {android => platform/android}/MapboxGLAndroidSDKTestApp/proguard-rules.pro (100%) rename {android => platform/android}/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/BaseTest.java (100%) rename {android => platform/android}/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/BulkMarkerActivityTest.java (100%) rename {android => platform/android}/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/InfoWindowActivityTest.java (100%) rename {android => platform/android}/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/InfoWindowAdapterActivityTest.java (100%) rename {android => platform/android}/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/MainActivityScreenTest.java (100%) rename {android => platform/android}/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/MainActivityTest.java (100%) rename {android => platform/android}/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/MapFragmentActivityTest.java (100%) rename {android => platform/android}/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/MyLocationTrackingModeActivityTest.java (100%) rename {android => platform/android}/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/PolylineActivityTest.java (100%) rename {android => platform/android}/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/PressForMarkerActivityTest.java (100%) rename {android => platform/android}/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/TiltActivityTest.java (100%) rename {android => platform/android}/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/VisibleCoordinateBoundsActivityTest.java (100%) rename {android => platform/android}/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/utils/ScreenshotUtil.java (100%) rename {android => platform/android}/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml (100%) rename {android => platform/android}/MapboxGLAndroidSDKTestApp/src/main/assets/dog-park-24.png (100%) rename {android => platform/android}/MapboxGLAndroidSDKTestApp/src/main/assets/points.geojson (100%) rename {android => platform/android}/MapboxGLAndroidSDKTestApp/src/main/assets/small_line.geojson (100%) rename {android => platform/android}/MapboxGLAndroidSDKTestApp/src/main/assets/small_poly.geojson (100%) rename {android => platform/android}/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/BulkMarkerActivity.java (100%) rename {android => platform/android}/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/CoordinateChangeActivity.java (100%) rename {android => platform/android}/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/ExampleCustomLayer.java (100%) rename {android => platform/android}/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/InfoWindowActivity.java (100%) rename {android => platform/android}/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/InfoWindowAdapterActivity.java (100%) rename {android => platform/android}/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/InfoWindowConcurrentActivity.java (100%) rename {android => platform/android}/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/MainActivity.java (100%) rename {android => platform/android}/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/ManualZoomActivity.java (100%) rename {android => platform/android}/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/MapFragmentActivity.java (100%) rename {android => platform/android}/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/MyLocationTrackingModeActivity.java (100%) rename {android => platform/android}/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/PolylineActivity.java (100%) rename {android => platform/android}/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/PressForMarkerActivity.java (100%) rename {android => platform/android}/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/TiltActivity.java (100%) rename {android => platform/android}/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/VisibleCoordinateBoundsActivity.java (100%) rename {android => platform/android}/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/GeoParseUtil.java (100%) rename {android => platform/android}/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/TimingLogger.java (100%) rename {android => platform/android}/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/icon.png (100%) rename {android => platform/android}/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/icon_burned.png (100%) rename {android => platform/android}/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/icon.png (100%) rename {android => platform/android}/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/icon_burned.png (100%) rename {android => platform/android}/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/icon.png (100%) rename {android => platform/android}/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/icon_burned.png (100%) rename {android => platform/android}/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/icon.png (100%) rename {android => platform/android}/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/icon_burned.png (100%) rename {android => platform/android}/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/icon.png (100%) rename {android => platform/android}/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/icon_burned.png (100%) rename {android => platform/android}/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_add_24dp.xml (100%) rename {android => platform/android}/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_animate_coordinates.xml (100%) rename {android => platform/android}/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_blur_on_24dp.xml (100%) rename {android => platform/android}/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_bug_report_24dp.xml (100%) rename {android => platform/android}/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_crop_24dp.xml (100%) rename {android => platform/android}/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_delete_24dp.xml (100%) rename {android => platform/android}/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_filter_center_focus_24dp.xml (100%) rename {android => platform/android}/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_filter_none_24dp.xml (100%) rename {android => platform/android}/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_flip_to_back_24dp.xml (100%) rename {android => platform/android}/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_flip_to_front_24dp.xml (100%) rename {android => platform/android}/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_gps_fixed_24dp.xml (100%) rename {android => platform/android}/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_infowindow_adapter.xml (100%) rename {android => platform/android}/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_infowindow_concurrent.xml (100%) rename {android => platform/android}/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_location_city_24dp.xml (100%) rename {android => platform/android}/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_menu_24dp.xml (100%) rename {android => platform/android}/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_navigation_24dp.xml (100%) rename {android => platform/android}/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_now_widgets_24dp.xml (100%) rename {android => platform/android}/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_pin_drop_24dp.xml (100%) rename {android => platform/android}/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_place_24dp.xml (100%) rename {android => platform/android}/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_tilt.xml (100%) rename {android => platform/android}/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_trending_up_24dp.xml (100%) rename {android => platform/android}/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_animate_coordinate.xml (100%) rename {android => platform/android}/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_infowindow.xml (100%) rename {android => platform/android}/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_infowindow_adapter.xml (100%) rename {android => platform/android}/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_infowindow_concurrent.xml (100%) rename {android => platform/android}/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_main.xml (100%) rename {android => platform/android}/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_manual_zoom.xml (100%) rename {android => platform/android}/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_fragment.xml (100%) rename {android => platform/android}/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_marker_bulk.xml (100%) rename {android => platform/android}/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_my_location_tracking.xml (100%) rename {android => platform/android}/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_polyline.xml (100%) rename {android => platform/android}/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_press_for_marker.xml (100%) rename {android => platform/android}/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_tilt.xml (100%) rename {android => platform/android}/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_visible_bounds.xml (100%) rename {android => platform/android}/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_drawer.xml (100%) rename {android => platform/android}/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_main.xml (100%) rename {android => platform/android}/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_polyline.xml (100%) rename {android => platform/android}/MapboxGLAndroidSDKTestApp/src/main/res/values/colors.xml (100%) rename {android => platform/android}/MapboxGLAndroidSDKTestApp/src/main/res/values/dimens.xml (100%) rename {android => platform/android}/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml (100%) rename {android => platform/android}/MapboxGLAndroidSDKTestApp/src/main/res/values/styles.xml (100%) rename {android => platform/android}/MapboxGLAndroidSDKTestApp/src/test/java/BoundingBoxTest.java (100%) rename {android => platform/android}/MapboxGLAndroidSDKTestApp/src/test/java/CoordinateBoundsTest.java (100%) rename {android => platform/android}/MapboxGLAndroidSDKTestApp/src/test/java/CoordinateRegionTest.java (100%) rename {android => platform/android}/MapboxGLAndroidSDKTestApp/src/test/java/CoordinateSpanTest.java (100%) rename {android => platform/android}/MapboxGLAndroidSDKTestApp/src/test/java/LatLngTest.java (100%) rename {android => platform/android}/MapboxGLAndroidSDKTestApp/src/test/java/LatLngZoomTest.java (100%) rename {android => platform/android}/MapboxGLAndroidSDKTestApp/src/test/java/MarkerTest.java (100%) rename {android => platform/android}/MapboxGLAndroidSDKTestApp/src/test/java/PolygonTest.java (100%) rename {android => platform/android}/MapboxGLAndroidSDKTestApp/src/test/java/PolylineTest.java (100%) rename {android => platform/android}/MapboxGLAndroidSDKTestApp/src/test/java/ProjectedMetersTest.java (100%) rename {android => platform/android}/build.gradle (100%) rename {android => platform/android}/checks.xml (100%) rename {android => platform/android}/gradle/wrapper/gradle-wrapper.jar (100%) rename {android => platform/android}/gradle/wrapper/gradle-wrapper.properties (100%) rename {android => platform/android}/gradlew (100%) rename {android => platform/android}/gradlew.bat (100%) rename {android => platform/android}/settings.gradle (100%) diff --git a/.gitignore b/.gitignore index e68138b49..f9fd16cd2 100644 --- a/.gitignore +++ b/.gitignore @@ -4,11 +4,11 @@ *.actual.png *.diff.png *.pyc -/android/debug -/android/sdk -/android/**/.classpath -/android/**/.project -/android/**/.settings/ +/platform/android/debug +/platform/android/sdk +/platform/android/**/.classpath +/platform/android/**/.project +/platform/android/**/.settings/ /mason_packages /config/*.gypi /build diff --git a/Makefile b/Makefile index 20ec49f8c..364aaad93 100644 --- a/Makefile +++ b/Makefile @@ -87,13 +87,13 @@ android-lib: ; $(RUN) HOST=android Makefile/androidapp # Builds the selected/default Android library android: android-lib - cd android && ./gradlew --parallel --max-workers=$(JOBS) assemble$(BUILDTYPE) + cd platform/android && ./gradlew --parallel --max-workers=$(JOBS) assemble$(BUILDTYPE) # Builds all android architectures for distribution. apackage: android-lib-arm-v5 android-lib-arm-v7 apackage: android-lib-x86 apackage: android-lib-mips - cd android && ./gradlew --parallel-threads=$(JOBS) assemble$(BUILDTYPE) + cd platform/android && ./gradlew --parallel-threads=$(JOBS) assemble$(BUILDTYPE) # Builds the Node.js library .PHONY: node @@ -158,8 +158,12 @@ clean: clear_sqlite_cache clear_xcode_cache -rm -rf ./ios/build -rm -rf ./test/build -rm -rf ./config/*.gypi - -rm -rf ./android/build ./android/MapboxGLAndroidSDK/build ./android/MapboxGLAndroidSDKTestApp/build - -rm -rf ./android/MapboxGLAndroidSDK/src/main/jniLibs ./android/MapboxGLAndroidSDK/src/main/obj.target ./android/MapboxGLAndroidSDK/src/main/assets + -rm -rf ./platform/android/build \ + ./platform/android/MapboxGLAndroidSDK/build \ + ./platform/android/MapboxGLAndroidSDKTestApp/build \ + ./platform/android/MapboxGLAndroidSDK/src/main/jniLibs \ + ./platform/android/MapboxGLAndroidSDK/src/main/obj.target \ + ./platform/android/MapboxGLAndroidSDK/src/main/assets distclean: clean -rm -rf ./mason_packages diff --git a/docs/DEVELOP_ANDROID_OSX.md b/docs/DEVELOP_ANDROID_OSX.md index 2992e8f72..30462a0df 100644 --- a/docs/DEVELOP_ANDROID_OSX.md +++ b/docs/DEVELOP_ANDROID_OSX.md @@ -26,10 +26,10 @@ you can edit `developer-config.xml` and add the value manually. ## Developing In Android Studio -To work with the Mapbox Android SDK, you'll first need to get it set up as a Project in Android Studio. To do so Open Android Studio and select "Import project (Eclipse ADT, Gradle, etc.)" from the Welcome to Android Studio dialog. From there select the `android` directory from the local file system where `mapbox-gl-native` was cloned. For example: +To work with the Mapbox Android SDK, you'll first need to get it set up as a Project in Android Studio. To do so Open Android Studio and select "Import project (Eclipse ADT, Gradle, etc.)" from the Welcome to Android Studio dialog. From there select the `platform/android` directory from the local file system where `mapbox-gl-native` was cloned. For example: ```sh -/Users//development/mapbox-gl-native/android +/Users//development/mapbox-gl-native/platform/android ``` The Mapbox Android SDK is a multi-module Gradle based project. Specifically, the SDK itself is an [Android Library](http://developer.android.com/tools/projects/index.html#LibraryModules) module and it utilizes a companion [test module](http://developer.android.com/tools/projects/index.html#testing) (aka "the TestApp") for daily development. When Android Studio finishes importing the project both `MapboxGLAndroidSDK` and `MapboxGLAndroidSDKTestApp` modules should be visible. diff --git a/android/.gitignore b/platform/android/.gitignore similarity index 100% rename from android/.gitignore rename to platform/android/.gitignore diff --git a/android/MapboxGLAndroidSDK/build.gradle b/platform/android/MapboxGLAndroidSDK/build.gradle similarity index 100% rename from android/MapboxGLAndroidSDK/build.gradle rename to platform/android/MapboxGLAndroidSDK/build.gradle diff --git a/android/MapboxGLAndroidSDK/deploy.sh b/platform/android/MapboxGLAndroidSDK/deploy.sh similarity index 100% rename from android/MapboxGLAndroidSDK/deploy.sh rename to platform/android/MapboxGLAndroidSDK/deploy.sh diff --git a/android/MapboxGLAndroidSDK/gradle.properties b/platform/android/MapboxGLAndroidSDK/gradle.properties similarity index 100% rename from android/MapboxGLAndroidSDK/gradle.properties rename to platform/android/MapboxGLAndroidSDK/gradle.properties diff --git a/android/MapboxGLAndroidSDK/lint.xml b/platform/android/MapboxGLAndroidSDK/lint.xml similarity index 100% rename from android/MapboxGLAndroidSDK/lint.xml rename to platform/android/MapboxGLAndroidSDK/lint.xml diff --git a/android/MapboxGLAndroidSDK/proguard-rules.pro b/platform/android/MapboxGLAndroidSDK/proguard-rules.pro similarity index 100% rename from android/MapboxGLAndroidSDK/proguard-rules.pro rename to platform/android/MapboxGLAndroidSDK/proguard-rules.pro diff --git a/android/MapboxGLAndroidSDK/src/main/AndroidManifest.xml b/platform/android/MapboxGLAndroidSDK/src/main/AndroidManifest.xml similarity index 100% rename from android/MapboxGLAndroidSDK/src/main/AndroidManifest.xml rename to platform/android/MapboxGLAndroidSDK/src/main/AndroidManifest.xml diff --git a/android/MapboxGLAndroidSDK/src/main/java/com/almeros/android/multitouch/gesturedetectors/BaseGestureDetector.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/almeros/android/multitouch/gesturedetectors/BaseGestureDetector.java similarity index 100% rename from android/MapboxGLAndroidSDK/src/main/java/com/almeros/android/multitouch/gesturedetectors/BaseGestureDetector.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/almeros/android/multitouch/gesturedetectors/BaseGestureDetector.java diff --git a/android/MapboxGLAndroidSDK/src/main/java/com/almeros/android/multitouch/gesturedetectors/MoveGestureDetector.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/almeros/android/multitouch/gesturedetectors/MoveGestureDetector.java similarity index 100% rename from android/MapboxGLAndroidSDK/src/main/java/com/almeros/android/multitouch/gesturedetectors/MoveGestureDetector.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/almeros/android/multitouch/gesturedetectors/MoveGestureDetector.java diff --git a/android/MapboxGLAndroidSDK/src/main/java/com/almeros/android/multitouch/gesturedetectors/RotateGestureDetector.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/almeros/android/multitouch/gesturedetectors/RotateGestureDetector.java similarity index 100% rename from android/MapboxGLAndroidSDK/src/main/java/com/almeros/android/multitouch/gesturedetectors/RotateGestureDetector.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/almeros/android/multitouch/gesturedetectors/RotateGestureDetector.java diff --git a/android/MapboxGLAndroidSDK/src/main/java/com/almeros/android/multitouch/gesturedetectors/ShoveGestureDetector.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/almeros/android/multitouch/gesturedetectors/ShoveGestureDetector.java similarity index 100% rename from android/MapboxGLAndroidSDK/src/main/java/com/almeros/android/multitouch/gesturedetectors/ShoveGestureDetector.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/almeros/android/multitouch/gesturedetectors/ShoveGestureDetector.java diff --git a/android/MapboxGLAndroidSDK/src/main/java/com/almeros/android/multitouch/gesturedetectors/TwoFingerGestureDetector.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/almeros/android/multitouch/gesturedetectors/TwoFingerGestureDetector.java similarity index 100% rename from android/MapboxGLAndroidSDK/src/main/java/com/almeros/android/multitouch/gesturedetectors/TwoFingerGestureDetector.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/almeros/android/multitouch/gesturedetectors/TwoFingerGestureDetector.java diff --git a/android/MapboxGLAndroidSDK/src/main/java/com/almeros/android/multitouch/gesturedetectors/package-info.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/almeros/android/multitouch/gesturedetectors/package-info.java similarity index 100% rename from android/MapboxGLAndroidSDK/src/main/java/com/almeros/android/multitouch/gesturedetectors/package-info.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/almeros/android/multitouch/gesturedetectors/package-info.java diff --git a/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/MapFragment.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/MapFragment.java similarity index 100% rename from android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/MapFragment.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/MapFragment.java diff --git a/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Annotation.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Annotation.java similarity index 100% rename from android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Annotation.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Annotation.java diff --git a/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/InfoWindow.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/InfoWindow.java similarity index 100% rename from android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/InfoWindow.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/InfoWindow.java diff --git a/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/InfoWindowTipView.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/InfoWindowTipView.java similarity index 100% rename from android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/InfoWindowTipView.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/InfoWindowTipView.java diff --git a/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/InfoWindowView.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/InfoWindowView.java similarity index 100% rename from android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/InfoWindowView.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/InfoWindowView.java diff --git a/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Marker.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Marker.java similarity index 100% rename from android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Marker.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Marker.java diff --git a/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerOptions.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerOptions.java similarity index 100% rename from android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerOptions.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerOptions.java diff --git a/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MultiPoint.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MultiPoint.java similarity index 100% rename from android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MultiPoint.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MultiPoint.java diff --git a/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Polygon.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Polygon.java similarity index 100% rename from android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Polygon.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Polygon.java diff --git a/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/PolygonOptions.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/PolygonOptions.java similarity index 100% rename from android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/PolygonOptions.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/PolygonOptions.java diff --git a/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Polyline.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Polyline.java similarity index 100% rename from android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Polyline.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Polyline.java diff --git a/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/PolylineOptions.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/PolylineOptions.java similarity index 100% rename from android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/PolylineOptions.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/PolylineOptions.java diff --git a/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Sprite.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Sprite.java similarity index 100% rename from android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Sprite.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Sprite.java diff --git a/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/SpriteFactory.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/SpriteFactory.java similarity index 100% rename from android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/SpriteFactory.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/SpriteFactory.java diff --git a/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/package-info.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/package-info.java similarity index 100% rename from android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/package-info.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/package-info.java diff --git a/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/GeoConstants.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/GeoConstants.java similarity index 100% rename from android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/GeoConstants.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/GeoConstants.java diff --git a/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/MapboxConstants.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/MapboxConstants.java similarity index 100% rename from android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/MapboxConstants.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/MapboxConstants.java diff --git a/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/MathConstants.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/MathConstants.java similarity index 100% rename from android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/MathConstants.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/MathConstants.java diff --git a/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/MyBearingTracking.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/MyBearingTracking.java similarity index 100% rename from android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/MyBearingTracking.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/MyBearingTracking.java diff --git a/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/MyLocationTracking.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/MyLocationTracking.java similarity index 100% rename from android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/MyLocationTracking.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/MyLocationTracking.java diff --git a/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/Style.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/Style.java similarity index 100% rename from android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/Style.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/Style.java diff --git a/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/package-info.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/package-info.java similarity index 100% rename from android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/package-info.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/package-info.java diff --git a/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/exceptions/InvalidAccessTokenException.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/exceptions/InvalidAccessTokenException.java similarity index 100% rename from android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/exceptions/InvalidAccessTokenException.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/exceptions/InvalidAccessTokenException.java diff --git a/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/exceptions/SpriteBitmapChangedException.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/exceptions/SpriteBitmapChangedException.java similarity index 100% rename from android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/exceptions/SpriteBitmapChangedException.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/exceptions/SpriteBitmapChangedException.java diff --git a/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/exceptions/TooManySpritesException.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/exceptions/TooManySpritesException.java similarity index 100% rename from android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/exceptions/TooManySpritesException.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/exceptions/TooManySpritesException.java diff --git a/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/exceptions/package-info.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/exceptions/package-info.java similarity index 100% rename from android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/exceptions/package-info.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/exceptions/package-info.java diff --git a/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/BoundingBox.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/BoundingBox.java similarity index 100% rename from android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/BoundingBox.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/BoundingBox.java diff --git a/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/CoordinateBounds.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/CoordinateBounds.java similarity index 100% rename from android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/CoordinateBounds.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/CoordinateBounds.java diff --git a/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/CoordinateRegion.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/CoordinateRegion.java similarity index 100% rename from android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/CoordinateRegion.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/CoordinateRegion.java diff --git a/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/CoordinateSpan.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/CoordinateSpan.java similarity index 100% rename from android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/CoordinateSpan.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/CoordinateSpan.java diff --git a/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/ILatLng.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/ILatLng.java similarity index 100% rename from android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/ILatLng.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/ILatLng.java diff --git a/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/IProjectedMeters.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/IProjectedMeters.java similarity index 100% rename from android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/IProjectedMeters.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/IProjectedMeters.java diff --git a/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/LatLng.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/LatLng.java similarity index 100% rename from android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/LatLng.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/LatLng.java diff --git a/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/LatLngZoom.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/LatLngZoom.java similarity index 100% rename from android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/LatLngZoom.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/LatLngZoom.java diff --git a/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/ProjectedMeters.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/ProjectedMeters.java similarity index 100% rename from android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/ProjectedMeters.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/ProjectedMeters.java diff --git a/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/package-info.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/package-info.java similarity index 100% rename from android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/package-info.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/package-info.java diff --git a/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/HTTPContext.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/HTTPContext.java similarity index 100% rename from android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/HTTPContext.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/HTTPContext.java diff --git a/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/package-info.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/package-info.java similarity index 100% rename from android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/package-info.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/package-info.java diff --git a/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/layers/CustomLayer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/layers/CustomLayer.java similarity index 100% rename from android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/layers/CustomLayer.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/layers/CustomLayer.java diff --git a/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/layers/package-info.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/layers/package-info.java similarity index 100% rename from android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/layers/package-info.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/layers/package-info.java diff --git a/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationListener.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationListener.java similarity index 100% rename from android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationListener.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationListener.java diff --git a/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationServices.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationServices.java similarity index 100% rename from android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationServices.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationServices.java diff --git a/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/package-info.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/package-info.java similarity index 100% rename from android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/package-info.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/package-info.java diff --git a/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/ApiAccess.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/ApiAccess.java similarity index 100% rename from android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/ApiAccess.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/ApiAccess.java diff --git a/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/package-info.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/package-info.java similarity index 100% rename from android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/package-info.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/package-info.java diff --git a/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/CompassView.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/CompassView.java similarity index 100% rename from android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/CompassView.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/CompassView.java diff --git a/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/MapView.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/MapView.java similarity index 100% rename from android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/MapView.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/MapView.java diff --git a/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/NativeMapView.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/NativeMapView.java similarity index 100% rename from android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/NativeMapView.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/NativeMapView.java diff --git a/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/UserLocationView.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/UserLocationView.java similarity index 100% rename from android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/UserLocationView.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/UserLocationView.java diff --git a/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/package-info.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/package-info.java similarity index 100% rename from android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/package-info.java rename to platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/package-info.java diff --git a/android/MapboxGLAndroidSDK/src/main/java/overview.html b/platform/android/MapboxGLAndroidSDK/src/main/java/overview.html similarity index 100% rename from android/MapboxGLAndroidSDK/src/main/java/overview.html rename to platform/android/MapboxGLAndroidSDK/src/main/java/overview.html diff --git a/android/MapboxGLAndroidSDK/src/main/res-public/values/public.xml b/platform/android/MapboxGLAndroidSDK/src/main/res-public/values/public.xml similarity index 100% rename from android/MapboxGLAndroidSDK/src/main/res-public/values/public.xml rename to platform/android/MapboxGLAndroidSDK/src/main/res-public/values/public.xml diff --git a/android/MapboxGLAndroidSDK/src/main/res/color/material_bg_selector.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/color/material_bg_selector.xml similarity index 100% rename from android/MapboxGLAndroidSDK/src/main/res/color/material_bg_selector.xml rename to platform/android/MapboxGLAndroidSDK/src/main/res/color/material_bg_selector.xml diff --git a/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/attribution_logo.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/attribution_logo.png similarity index 100% rename from android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/attribution_logo.png rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/attribution_logo.png diff --git a/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/compass.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/compass.png similarity index 100% rename from android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/compass.png rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/compass.png diff --git a/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/default_marker.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/default_marker.png similarity index 100% rename from android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/default_marker.png rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/default_marker.png diff --git a/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/my_location.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/my_location.png similarity index 100% rename from android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/my_location.png rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/my_location.png diff --git a/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/my_location_bearing.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/my_location_bearing.png similarity index 100% rename from android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/my_location_bearing.png rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/my_location_bearing.png diff --git a/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/my_location_stale.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/my_location_stale.png similarity index 100% rename from android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/my_location_stale.png rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/my_location_stale.png diff --git a/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/attribution_logo.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/attribution_logo.png similarity index 100% rename from android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/attribution_logo.png rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/attribution_logo.png diff --git a/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/compass.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/compass.png similarity index 100% rename from android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/compass.png rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/compass.png diff --git a/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/default_marker.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/default_marker.png similarity index 100% rename from android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/default_marker.png rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/default_marker.png diff --git a/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/my_location.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/my_location.png similarity index 100% rename from android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/my_location.png rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/my_location.png diff --git a/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/my_location_bearing.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/my_location_bearing.png similarity index 100% rename from android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/my_location_bearing.png rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/my_location_bearing.png diff --git a/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/my_location_stale.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/my_location_stale.png similarity index 100% rename from android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/my_location_stale.png rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/my_location_stale.png diff --git a/android/MapboxGLAndroidSDK/src/main/res/drawable-v21/bg_default_selector.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-v21/bg_default_selector.xml similarity index 100% rename from android/MapboxGLAndroidSDK/src/main/res/drawable-v21/bg_default_selector.xml rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable-v21/bg_default_selector.xml diff --git a/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/attribution_logo.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/attribution_logo.png similarity index 100% rename from android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/attribution_logo.png rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/attribution_logo.png diff --git a/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/compass.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/compass.png similarity index 100% rename from android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/compass.png rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/compass.png diff --git a/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/default_marker.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/default_marker.png similarity index 100% rename from android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/default_marker.png rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/default_marker.png diff --git a/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/my_location.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/my_location.png similarity index 100% rename from android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/my_location.png rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/my_location.png diff --git a/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/my_location_bearing.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/my_location_bearing.png similarity index 100% rename from android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/my_location_bearing.png rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/my_location_bearing.png diff --git a/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/my_location_stale.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/my_location_stale.png similarity index 100% rename from android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/my_location_stale.png rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/my_location_stale.png diff --git a/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/attribution_logo.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/attribution_logo.png similarity index 100% rename from android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/attribution_logo.png rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/attribution_logo.png diff --git a/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/compass.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/compass.png similarity index 100% rename from android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/compass.png rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/compass.png diff --git a/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/default_marker.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/default_marker.png similarity index 100% rename from android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/default_marker.png rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/default_marker.png diff --git a/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/my_location.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/my_location.png similarity index 100% rename from android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/my_location.png rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/my_location.png diff --git a/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/my_location_bearing.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/my_location_bearing.png similarity index 100% rename from android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/my_location_bearing.png rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/my_location_bearing.png diff --git a/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/my_location_stale.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/my_location_stale.png similarity index 100% rename from android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/my_location_stale.png rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/my_location_stale.png diff --git a/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/attribution_logo.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/attribution_logo.png similarity index 100% rename from android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/attribution_logo.png rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/attribution_logo.png diff --git a/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/bg_infowindow_content.9.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/bg_infowindow_content.9.png similarity index 100% rename from android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/bg_infowindow_content.9.png rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/bg_infowindow_content.9.png diff --git a/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/compass.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/compass.png similarity index 100% rename from android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/compass.png rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/compass.png diff --git a/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/default_marker.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/default_marker.png similarity index 100% rename from android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/default_marker.png rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/default_marker.png diff --git a/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/my_location.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/my_location.png similarity index 100% rename from android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/my_location.png rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/my_location.png diff --git a/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/my_location_bearing.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/my_location_bearing.png similarity index 100% rename from android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/my_location_bearing.png rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/my_location_bearing.png diff --git a/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/my_location_stale.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/my_location_stale.png similarity index 100% rename from android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/my_location_stale.png rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/my_location_stale.png diff --git a/android/MapboxGLAndroidSDK/src/main/res/drawable/bg_default_selector.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable/bg_default_selector.xml similarity index 100% rename from android/MapboxGLAndroidSDK/src/main/res/drawable/bg_default_selector.xml rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable/bg_default_selector.xml diff --git a/android/MapboxGLAndroidSDK/src/main/res/drawable/ic_info_outline_24dp.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable/ic_info_outline_24dp.xml similarity index 100% rename from android/MapboxGLAndroidSDK/src/main/res/drawable/ic_info_outline_24dp.xml rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable/ic_info_outline_24dp.xml diff --git a/android/MapboxGLAndroidSDK/src/main/res/drawable/ic_info_outline_24dp_selected.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable/ic_info_outline_24dp_selected.xml similarity index 100% rename from android/MapboxGLAndroidSDK/src/main/res/drawable/ic_info_outline_24dp_selected.xml rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable/ic_info_outline_24dp_selected.xml diff --git a/android/MapboxGLAndroidSDK/src/main/res/drawable/ic_info_outline_24dp_selector.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable/ic_info_outline_24dp_selector.xml similarity index 100% rename from android/MapboxGLAndroidSDK/src/main/res/drawable/ic_info_outline_24dp_selector.xml rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable/ic_info_outline_24dp_selector.xml diff --git a/android/MapboxGLAndroidSDK/src/main/res/layout/attribution_list_item.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/layout/attribution_list_item.xml similarity index 100% rename from android/MapboxGLAndroidSDK/src/main/res/layout/attribution_list_item.xml rename to platform/android/MapboxGLAndroidSDK/src/main/res/layout/attribution_list_item.xml diff --git a/android/MapboxGLAndroidSDK/src/main/res/layout/fragment_mapview.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/layout/fragment_mapview.xml similarity index 100% rename from android/MapboxGLAndroidSDK/src/main/res/layout/fragment_mapview.xml rename to platform/android/MapboxGLAndroidSDK/src/main/res/layout/fragment_mapview.xml diff --git a/android/MapboxGLAndroidSDK/src/main/res/layout/infowindow_content.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/layout/infowindow_content.xml similarity index 100% rename from android/MapboxGLAndroidSDK/src/main/res/layout/infowindow_content.xml rename to platform/android/MapboxGLAndroidSDK/src/main/res/layout/infowindow_content.xml diff --git a/android/MapboxGLAndroidSDK/src/main/res/layout/infowindow_view.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/layout/infowindow_view.xml similarity index 100% rename from android/MapboxGLAndroidSDK/src/main/res/layout/infowindow_view.xml rename to platform/android/MapboxGLAndroidSDK/src/main/res/layout/infowindow_view.xml diff --git a/android/MapboxGLAndroidSDK/src/main/res/layout/mapview_internal.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/layout/mapview_internal.xml similarity index 100% rename from android/MapboxGLAndroidSDK/src/main/res/layout/mapview_internal.xml rename to platform/android/MapboxGLAndroidSDK/src/main/res/layout/mapview_internal.xml diff --git a/android/MapboxGLAndroidSDK/src/main/res/values/arrays.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/values/arrays.xml similarity index 100% rename from android/MapboxGLAndroidSDK/src/main/res/values/arrays.xml rename to platform/android/MapboxGLAndroidSDK/src/main/res/values/arrays.xml diff --git a/android/MapboxGLAndroidSDK/src/main/res/values/attrs.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/values/attrs.xml similarity index 100% rename from android/MapboxGLAndroidSDK/src/main/res/values/attrs.xml rename to platform/android/MapboxGLAndroidSDK/src/main/res/values/attrs.xml diff --git a/android/MapboxGLAndroidSDK/src/main/res/values/colors.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/values/colors.xml similarity index 100% rename from android/MapboxGLAndroidSDK/src/main/res/values/colors.xml rename to platform/android/MapboxGLAndroidSDK/src/main/res/values/colors.xml diff --git a/android/MapboxGLAndroidSDK/src/main/res/values/dimens.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/values/dimens.xml similarity index 100% rename from android/MapboxGLAndroidSDK/src/main/res/values/dimens.xml rename to platform/android/MapboxGLAndroidSDK/src/main/res/values/dimens.xml diff --git a/android/MapboxGLAndroidSDK/src/main/res/values/strings.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/values/strings.xml similarity index 100% rename from android/MapboxGLAndroidSDK/src/main/res/values/strings.xml rename to platform/android/MapboxGLAndroidSDK/src/main/res/values/strings.xml diff --git a/android/MapboxGLAndroidSDK/src/main/res/values/styles.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/values/styles.xml similarity index 100% rename from android/MapboxGLAndroidSDK/src/main/res/values/styles.xml rename to platform/android/MapboxGLAndroidSDK/src/main/res/values/styles.xml diff --git a/android/MapboxGLAndroidSDK/src/main/resources/fabric/com.mapbox.mapboxsdk.mapbox-android-sdk.properties b/platform/android/MapboxGLAndroidSDK/src/main/resources/fabric/com.mapbox.mapboxsdk.mapbox-android-sdk.properties similarity index 100% rename from android/MapboxGLAndroidSDK/src/main/resources/fabric/com.mapbox.mapboxsdk.mapbox-android-sdk.properties rename to platform/android/MapboxGLAndroidSDK/src/main/resources/fabric/com.mapbox.mapboxsdk.mapbox-android-sdk.properties diff --git a/android/MapboxGLAndroidSDKTestApp/README.md b/platform/android/MapboxGLAndroidSDKTestApp/README.md similarity index 100% rename from android/MapboxGLAndroidSDKTestApp/README.md rename to platform/android/MapboxGLAndroidSDKTestApp/README.md diff --git a/android/MapboxGLAndroidSDKTestApp/build.gradle b/platform/android/MapboxGLAndroidSDKTestApp/build.gradle similarity index 100% rename from android/MapboxGLAndroidSDKTestApp/build.gradle rename to platform/android/MapboxGLAndroidSDKTestApp/build.gradle diff --git a/android/MapboxGLAndroidSDKTestApp/lint.xml b/platform/android/MapboxGLAndroidSDKTestApp/lint.xml similarity index 100% rename from android/MapboxGLAndroidSDKTestApp/lint.xml rename to platform/android/MapboxGLAndroidSDKTestApp/lint.xml diff --git a/android/MapboxGLAndroidSDKTestApp/proguard-rules.pro b/platform/android/MapboxGLAndroidSDKTestApp/proguard-rules.pro similarity index 100% rename from android/MapboxGLAndroidSDKTestApp/proguard-rules.pro rename to platform/android/MapboxGLAndroidSDKTestApp/proguard-rules.pro diff --git a/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/BaseTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/BaseTest.java similarity index 100% rename from android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/BaseTest.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/BaseTest.java diff --git a/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/BulkMarkerActivityTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/BulkMarkerActivityTest.java similarity index 100% rename from android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/BulkMarkerActivityTest.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/BulkMarkerActivityTest.java diff --git a/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/InfoWindowActivityTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/InfoWindowActivityTest.java similarity index 100% rename from android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/InfoWindowActivityTest.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/InfoWindowActivityTest.java diff --git a/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/InfoWindowAdapterActivityTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/InfoWindowAdapterActivityTest.java similarity index 100% rename from android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/InfoWindowAdapterActivityTest.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/InfoWindowAdapterActivityTest.java diff --git a/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/MainActivityScreenTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/MainActivityScreenTest.java similarity index 100% rename from android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/MainActivityScreenTest.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/MainActivityScreenTest.java diff --git a/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/MainActivityTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/MainActivityTest.java similarity index 100% rename from android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/MainActivityTest.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/MainActivityTest.java diff --git a/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/MapFragmentActivityTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/MapFragmentActivityTest.java similarity index 100% rename from android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/MapFragmentActivityTest.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/MapFragmentActivityTest.java diff --git a/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/MyLocationTrackingModeActivityTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/MyLocationTrackingModeActivityTest.java similarity index 100% rename from android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/MyLocationTrackingModeActivityTest.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/MyLocationTrackingModeActivityTest.java diff --git a/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/PolylineActivityTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/PolylineActivityTest.java similarity index 100% rename from android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/PolylineActivityTest.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/PolylineActivityTest.java diff --git a/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/PressForMarkerActivityTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/PressForMarkerActivityTest.java similarity index 100% rename from android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/PressForMarkerActivityTest.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/PressForMarkerActivityTest.java diff --git a/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/TiltActivityTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/TiltActivityTest.java similarity index 100% rename from android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/TiltActivityTest.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/TiltActivityTest.java diff --git a/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/VisibleCoordinateBoundsActivityTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/VisibleCoordinateBoundsActivityTest.java similarity index 100% rename from android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/VisibleCoordinateBoundsActivityTest.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/VisibleCoordinateBoundsActivityTest.java diff --git a/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/utils/ScreenshotUtil.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/utils/ScreenshotUtil.java similarity index 100% rename from android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/utils/ScreenshotUtil.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/utils/ScreenshotUtil.java diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml similarity index 100% rename from android/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/assets/dog-park-24.png b/platform/android/MapboxGLAndroidSDKTestApp/src/main/assets/dog-park-24.png similarity index 100% rename from android/MapboxGLAndroidSDKTestApp/src/main/assets/dog-park-24.png rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/assets/dog-park-24.png diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/assets/points.geojson b/platform/android/MapboxGLAndroidSDKTestApp/src/main/assets/points.geojson similarity index 100% rename from android/MapboxGLAndroidSDKTestApp/src/main/assets/points.geojson rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/assets/points.geojson diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/assets/small_line.geojson b/platform/android/MapboxGLAndroidSDKTestApp/src/main/assets/small_line.geojson similarity index 100% rename from android/MapboxGLAndroidSDKTestApp/src/main/assets/small_line.geojson rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/assets/small_line.geojson diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/assets/small_poly.geojson b/platform/android/MapboxGLAndroidSDKTestApp/src/main/assets/small_poly.geojson similarity index 100% rename from android/MapboxGLAndroidSDKTestApp/src/main/assets/small_poly.geojson rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/assets/small_poly.geojson diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/BulkMarkerActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/BulkMarkerActivity.java similarity index 100% rename from android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/BulkMarkerActivity.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/BulkMarkerActivity.java diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/CoordinateChangeActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/CoordinateChangeActivity.java similarity index 100% rename from android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/CoordinateChangeActivity.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/CoordinateChangeActivity.java diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/ExampleCustomLayer.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/ExampleCustomLayer.java similarity index 100% rename from android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/ExampleCustomLayer.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/ExampleCustomLayer.java diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/InfoWindowActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/InfoWindowActivity.java similarity index 100% rename from android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/InfoWindowActivity.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/InfoWindowActivity.java diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/InfoWindowAdapterActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/InfoWindowAdapterActivity.java similarity index 100% rename from android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/InfoWindowAdapterActivity.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/InfoWindowAdapterActivity.java diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/InfoWindowConcurrentActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/InfoWindowConcurrentActivity.java similarity index 100% rename from android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/InfoWindowConcurrentActivity.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/InfoWindowConcurrentActivity.java diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/MainActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/MainActivity.java similarity index 100% rename from android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/MainActivity.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/MainActivity.java diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/ManualZoomActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/ManualZoomActivity.java similarity index 100% rename from android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/ManualZoomActivity.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/ManualZoomActivity.java diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/MapFragmentActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/MapFragmentActivity.java similarity index 100% rename from android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/MapFragmentActivity.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/MapFragmentActivity.java diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/MyLocationTrackingModeActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/MyLocationTrackingModeActivity.java similarity index 100% rename from android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/MyLocationTrackingModeActivity.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/MyLocationTrackingModeActivity.java diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/PolylineActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/PolylineActivity.java similarity index 100% rename from android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/PolylineActivity.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/PolylineActivity.java diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/PressForMarkerActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/PressForMarkerActivity.java similarity index 100% rename from android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/PressForMarkerActivity.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/PressForMarkerActivity.java diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/TiltActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/TiltActivity.java similarity index 100% rename from android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/TiltActivity.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/TiltActivity.java diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/VisibleCoordinateBoundsActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/VisibleCoordinateBoundsActivity.java similarity index 100% rename from android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/VisibleCoordinateBoundsActivity.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/VisibleCoordinateBoundsActivity.java diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/GeoParseUtil.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/GeoParseUtil.java similarity index 100% rename from android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/GeoParseUtil.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/GeoParseUtil.java diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/TimingLogger.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/TimingLogger.java similarity index 100% rename from android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/TimingLogger.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/TimingLogger.java diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/icon.png b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/icon.png similarity index 100% rename from android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/icon.png rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/icon.png diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/icon_burned.png b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/icon_burned.png similarity index 100% rename from android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/icon_burned.png rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-hdpi/icon_burned.png diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/icon.png b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/icon.png similarity index 100% rename from android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/icon.png rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/icon.png diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/icon_burned.png b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/icon_burned.png similarity index 100% rename from android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/icon_burned.png rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-mdpi/icon_burned.png diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/icon.png b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/icon.png similarity index 100% rename from android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/icon.png rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/icon.png diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/icon_burned.png b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/icon_burned.png similarity index 100% rename from android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/icon_burned.png rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xhdpi/icon_burned.png diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/icon.png b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/icon.png similarity index 100% rename from android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/icon.png rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/icon.png diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/icon_burned.png b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/icon_burned.png similarity index 100% rename from android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/icon_burned.png rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxhdpi/icon_burned.png diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/icon.png b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/icon.png similarity index 100% rename from android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/icon.png rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/icon.png diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/icon_burned.png b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/icon_burned.png similarity index 100% rename from android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/icon_burned.png rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable-xxxhdpi/icon_burned.png diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_add_24dp.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_add_24dp.xml similarity index 100% rename from android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_add_24dp.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_add_24dp.xml diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_animate_coordinates.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_animate_coordinates.xml similarity index 100% rename from android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_animate_coordinates.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_animate_coordinates.xml diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_blur_on_24dp.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_blur_on_24dp.xml similarity index 100% rename from android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_blur_on_24dp.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_blur_on_24dp.xml diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_bug_report_24dp.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_bug_report_24dp.xml similarity index 100% rename from android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_bug_report_24dp.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_bug_report_24dp.xml diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_crop_24dp.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_crop_24dp.xml similarity index 100% rename from android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_crop_24dp.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_crop_24dp.xml diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_delete_24dp.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_delete_24dp.xml similarity index 100% rename from android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_delete_24dp.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_delete_24dp.xml diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_filter_center_focus_24dp.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_filter_center_focus_24dp.xml similarity index 100% rename from android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_filter_center_focus_24dp.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_filter_center_focus_24dp.xml diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_filter_none_24dp.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_filter_none_24dp.xml similarity index 100% rename from android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_filter_none_24dp.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_filter_none_24dp.xml diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_flip_to_back_24dp.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_flip_to_back_24dp.xml similarity index 100% rename from android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_flip_to_back_24dp.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_flip_to_back_24dp.xml diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_flip_to_front_24dp.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_flip_to_front_24dp.xml similarity index 100% rename from android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_flip_to_front_24dp.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_flip_to_front_24dp.xml diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_gps_fixed_24dp.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_gps_fixed_24dp.xml similarity index 100% rename from android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_gps_fixed_24dp.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_gps_fixed_24dp.xml diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_infowindow_adapter.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_infowindow_adapter.xml similarity index 100% rename from android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_infowindow_adapter.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_infowindow_adapter.xml diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_infowindow_concurrent.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_infowindow_concurrent.xml similarity index 100% rename from android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_infowindow_concurrent.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_infowindow_concurrent.xml diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_location_city_24dp.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_location_city_24dp.xml similarity index 100% rename from android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_location_city_24dp.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_location_city_24dp.xml diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_menu_24dp.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_menu_24dp.xml similarity index 100% rename from android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_menu_24dp.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_menu_24dp.xml diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_navigation_24dp.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_navigation_24dp.xml similarity index 100% rename from android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_navigation_24dp.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_navigation_24dp.xml diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_now_widgets_24dp.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_now_widgets_24dp.xml similarity index 100% rename from android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_now_widgets_24dp.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_now_widgets_24dp.xml diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_pin_drop_24dp.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_pin_drop_24dp.xml similarity index 100% rename from android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_pin_drop_24dp.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_pin_drop_24dp.xml diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_place_24dp.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_place_24dp.xml similarity index 100% rename from android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_place_24dp.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_place_24dp.xml diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_tilt.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_tilt.xml similarity index 100% rename from android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_tilt.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_tilt.xml diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_trending_up_24dp.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_trending_up_24dp.xml similarity index 100% rename from android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_trending_up_24dp.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/drawable/ic_trending_up_24dp.xml diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_animate_coordinate.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_animate_coordinate.xml similarity index 100% rename from android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_animate_coordinate.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_animate_coordinate.xml diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_infowindow.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_infowindow.xml similarity index 100% rename from android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_infowindow.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_infowindow.xml diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_infowindow_adapter.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_infowindow_adapter.xml similarity index 100% rename from android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_infowindow_adapter.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_infowindow_adapter.xml diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_infowindow_concurrent.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_infowindow_concurrent.xml similarity index 100% rename from android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_infowindow_concurrent.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_infowindow_concurrent.xml diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_main.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_main.xml similarity index 100% rename from android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_main.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_main.xml diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_manual_zoom.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_manual_zoom.xml similarity index 100% rename from android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_manual_zoom.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_manual_zoom.xml diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_fragment.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_fragment.xml similarity index 100% rename from android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_fragment.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_fragment.xml diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_marker_bulk.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_marker_bulk.xml similarity index 100% rename from android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_marker_bulk.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_marker_bulk.xml diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_my_location_tracking.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_my_location_tracking.xml similarity index 100% rename from android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_my_location_tracking.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_my_location_tracking.xml diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_polyline.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_polyline.xml similarity index 100% rename from android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_polyline.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_polyline.xml diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_press_for_marker.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_press_for_marker.xml similarity index 100% rename from android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_press_for_marker.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_press_for_marker.xml diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_tilt.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_tilt.xml similarity index 100% rename from android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_tilt.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_tilt.xml diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_visible_bounds.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_visible_bounds.xml similarity index 100% rename from android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_visible_bounds.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_visible_bounds.xml diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_drawer.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_drawer.xml similarity index 100% rename from android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_drawer.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_drawer.xml diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_main.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_main.xml similarity index 100% rename from android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_main.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_main.xml diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_polyline.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_polyline.xml similarity index 100% rename from android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_polyline.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_polyline.xml diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/values/colors.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/colors.xml similarity index 100% rename from android/MapboxGLAndroidSDKTestApp/src/main/res/values/colors.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/colors.xml diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/values/dimens.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/dimens.xml similarity index 100% rename from android/MapboxGLAndroidSDKTestApp/src/main/res/values/dimens.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/dimens.xml diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml similarity index 100% rename from android/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/res/values/styles.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/styles.xml similarity index 100% rename from android/MapboxGLAndroidSDKTestApp/src/main/res/values/styles.xml rename to platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/styles.xml diff --git a/android/MapboxGLAndroidSDKTestApp/src/test/java/BoundingBoxTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/test/java/BoundingBoxTest.java similarity index 100% rename from android/MapboxGLAndroidSDKTestApp/src/test/java/BoundingBoxTest.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/test/java/BoundingBoxTest.java diff --git a/android/MapboxGLAndroidSDKTestApp/src/test/java/CoordinateBoundsTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/test/java/CoordinateBoundsTest.java similarity index 100% rename from android/MapboxGLAndroidSDKTestApp/src/test/java/CoordinateBoundsTest.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/test/java/CoordinateBoundsTest.java diff --git a/android/MapboxGLAndroidSDKTestApp/src/test/java/CoordinateRegionTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/test/java/CoordinateRegionTest.java similarity index 100% rename from android/MapboxGLAndroidSDKTestApp/src/test/java/CoordinateRegionTest.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/test/java/CoordinateRegionTest.java diff --git a/android/MapboxGLAndroidSDKTestApp/src/test/java/CoordinateSpanTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/test/java/CoordinateSpanTest.java similarity index 100% rename from android/MapboxGLAndroidSDKTestApp/src/test/java/CoordinateSpanTest.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/test/java/CoordinateSpanTest.java diff --git a/android/MapboxGLAndroidSDKTestApp/src/test/java/LatLngTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/test/java/LatLngTest.java similarity index 100% rename from android/MapboxGLAndroidSDKTestApp/src/test/java/LatLngTest.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/test/java/LatLngTest.java diff --git a/android/MapboxGLAndroidSDKTestApp/src/test/java/LatLngZoomTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/test/java/LatLngZoomTest.java similarity index 100% rename from android/MapboxGLAndroidSDKTestApp/src/test/java/LatLngZoomTest.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/test/java/LatLngZoomTest.java diff --git a/android/MapboxGLAndroidSDKTestApp/src/test/java/MarkerTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/test/java/MarkerTest.java similarity index 100% rename from android/MapboxGLAndroidSDKTestApp/src/test/java/MarkerTest.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/test/java/MarkerTest.java diff --git a/android/MapboxGLAndroidSDKTestApp/src/test/java/PolygonTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/test/java/PolygonTest.java similarity index 100% rename from android/MapboxGLAndroidSDKTestApp/src/test/java/PolygonTest.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/test/java/PolygonTest.java diff --git a/android/MapboxGLAndroidSDKTestApp/src/test/java/PolylineTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/test/java/PolylineTest.java similarity index 100% rename from android/MapboxGLAndroidSDKTestApp/src/test/java/PolylineTest.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/test/java/PolylineTest.java diff --git a/android/MapboxGLAndroidSDKTestApp/src/test/java/ProjectedMetersTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/test/java/ProjectedMetersTest.java similarity index 100% rename from android/MapboxGLAndroidSDKTestApp/src/test/java/ProjectedMetersTest.java rename to platform/android/MapboxGLAndroidSDKTestApp/src/test/java/ProjectedMetersTest.java diff --git a/platform/android/bitrise.yml b/platform/android/bitrise.yml index 7b99b8275..5a0a2e762 100644 --- a/platform/android/bitrise.yml +++ b/platform/android/bitrise.yml @@ -44,7 +44,7 @@ workflows: - content: |- #!/bin/bash - cd android + cd platform/android ./gradlew testReleaseUnitTest --continue - is_debug: 'yes' - slack: @@ -78,7 +78,7 @@ workflows: - content: |- #!/bin/bash - aws s3 cp s3://mapbox/android/signing-credentials/secring.gpg android/MapboxGLAndroidSDK/secring.gpg + aws s3 cp s3://mapbox/android/signing-credentials/secring.gpg platform/android/MapboxGLAndroidSDK/secring.gpg opts: is_expand: true - script: @@ -91,7 +91,7 @@ workflows: NEXUS_PASSWORD=$PUBLISH_NEXUS_PASSWORD signing.keyId=$SIGNING_KEYID signing.password=$SIGNING_PASSWORD - signing.secretKeyRingFile=secring.gpg" >> android/MapboxGLAndroidSDK/gradle.properties + signing.secretKeyRingFile=secring.gpg" >> platform/android/MapboxGLAndroidSDK/gradle.properties opts: is_expand: true - script: @@ -107,5 +107,5 @@ workflows: - content: |- #!/bin/bash - cd android + cd platform/android ./gradlew uploadArchives diff --git a/android/build.gradle b/platform/android/build.gradle similarity index 100% rename from android/build.gradle rename to platform/android/build.gradle diff --git a/android/checks.xml b/platform/android/checks.xml similarity index 100% rename from android/checks.xml rename to platform/android/checks.xml diff --git a/android/gradle/wrapper/gradle-wrapper.jar b/platform/android/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from android/gradle/wrapper/gradle-wrapper.jar rename to platform/android/gradle/wrapper/gradle-wrapper.jar diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/platform/android/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from android/gradle/wrapper/gradle-wrapper.properties rename to platform/android/gradle/wrapper/gradle-wrapper.properties diff --git a/android/gradlew b/platform/android/gradlew similarity index 100% rename from android/gradlew rename to platform/android/gradlew diff --git a/android/gradlew.bat b/platform/android/gradlew.bat similarity index 100% rename from android/gradlew.bat rename to platform/android/gradlew.bat diff --git a/platform/android/mapboxgl-app.gypi b/platform/android/mapboxgl-app.gypi index 4686c79c2..f817cb907 100644 --- a/platform/android/mapboxgl-app.gypi +++ b/platform/android/mapboxgl-app.gypi @@ -18,6 +18,7 @@ 'include_dirs': [ './include', + '../src', ], 'sources': [ @@ -112,13 +113,13 @@ 'files': [ '../../common/ca-bundle.crt', ], - 'destination': '<(pwd)/../android/MapboxGLAndroidSDK/src/main/assets' + 'destination': '<(pwd)/../platform/android/MapboxGLAndroidSDK/src/main/assets' }, { 'files': [ '<(PRODUCT_DIR)/obj.target' ], - 'destination': '<(pwd)/../android/MapboxGLAndroidSDK/src/main' + 'destination': '<(pwd)/../platform/android/MapboxGLAndroidSDK/src/main' }, ], @@ -126,13 +127,13 @@ { 'action_name': 'Strip mapbox library', 'inputs': [ '<(PRODUCT_DIR)/lib.target/libmapbox-gl.so' ], - 'outputs': [ '<(pwd)/../android/MapboxGLAndroidSDK/src/main/jniLibs/$(JNIDIR)/libmapbox-gl.so' ], + 'outputs': [ '<(pwd)/../platform/android/MapboxGLAndroidSDK/src/main/jniLibs/$(JNIDIR)/libmapbox-gl.so' ], 'action': [ '$(STRIP)', '<@(_inputs)', '-o', '<@(_outputs)' ] }, { 'action_name': 'Strip example custom layer library', 'inputs': [ '<(PRODUCT_DIR)/lib.target/libexample-custom-layer.so' ], - 'outputs': [ '<(pwd)/../android/MapboxGLAndroidSDKTestApp/src/main/jniLibs/$(JNIDIR)/libexample-custom-layer.so' ], + 'outputs': [ '<(pwd)/../platform/android/MapboxGLAndroidSDKTestApp/src/main/jniLibs/$(JNIDIR)/libexample-custom-layer.so' ], 'action': [ '$(STRIP)', '<@(_inputs)', '-o', '<@(_outputs)' ] } ], diff --git a/android/settings.gradle b/platform/android/settings.gradle similarity index 100% rename from android/settings.gradle rename to platform/android/settings.gradle diff --git a/scripts/android/run.sh b/scripts/android/run.sh index 9381edfee..9e87298fe 100755 --- a/scripts/android/run.sh +++ b/scripts/android/run.sh @@ -12,8 +12,8 @@ export MASON_ANDROID_ABI=${ANDROID_ABI} # Build ################################################################################ -mkdir -p ./android/MapboxGLAndroidSDKTestApp/src/main/res/raw -echo "${MAPBOX_ACCESS_TOKEN}" > ./android/MapboxGLAndroidSDKTestApp/src/main/res/raw/token.txt +mkdir -p ./platform/android/MapboxGLAndroidSDKTestApp/src/main/res/raw +echo "${MAPBOX_ACCESS_TOKEN}" > ./platform/android/MapboxGLAndroidSDKTestApp/src/main/res/raw/token.txt mapbox_time "compile_library" \ make android-lib HOST_VERSION=${ANDROID_ABI} -j${JOBS} BUILDTYPE=${BUILDTYPE} @@ -35,7 +35,7 @@ if [ ! -z "${AWS_ACCESS_KEY_ID}" ] && [ ! -z "${AWS_SECRET_ACCESS_KEY}" ] ; then echo "Deploying results..." S3_PREFIX=s3://mapbox/mapbox-gl-native/android/build/${TRAVIS_JOB_NUMBER} - APK_OUTPUTS=./android/MapboxGLAndroidSDKTestApp/build/outputs/apk + APK_OUTPUTS=./platform/android/MapboxGLAndroidSDKTestApp/build/outputs/apk JNILIB=`mason env JNIDIR` # ARM64 does not build APK for now diff --git a/update_icons.sh b/update_icons.sh index a76a0c4d3..5e0ac5b95 100755 --- a/update_icons.sh +++ b/update_icons.sh @@ -10,7 +10,7 @@ branch=`git rev-parse --abbrev-ref HEAD` repo=`git remote show origin | grep 'Fetch URL' | sed -e 's/.*github\.com:mapbox\///' -e 's/\.git$//' -e 's/^mapbox-//'` pwd=`pwd` -cd android/java/app/src/main/res +cd platform/android/java/app/src/main/res for folder in `find . -maxdepth 1 -type d -name drawable-\*` do cd ${folder}