[android] [build] [ci] Move Android JNI bindings code to mapbox-gl-native-android repo.upstream/tmpsantos-remove_android_specific_code

182 files changed, 13 insertions, 14120 deletions

diff --git a/circle.yml b/circle.yml
index 8d36e200e9..9ef9939778 100644
--- a/circle.yml
+++ b/circle.yml
@@ -30,7 +30,7 @@ workflows:
           requires:
             - sanity-checks
           config_params: '-G Ninja -DCMAKE_INSTALL_PREFIX=/tmp/workspace/install/$CIRCLE_JOB -DCMAKE_TOOLCHAIN_FILE=/opt/android/ndk-bundle/build/cmake/android.toolchain.cmake -DANDROID_CCACHE=/usr/bin/ccache -DANDROID_ABI=arm64-v8a'
-          build_params: '--target libmapbox-gl.so'
+          build_params: '--target libmbgl-render-test-runner.so'
           install: true
       - build-template:
           name: android-x86-release
@@ -39,7 +39,7 @@ workflows:
           requires:
             - sanity-checks
           config_params: '-G Ninja -DCMAKE_INSTALL_PREFIX=/tmp/workspace/install/$CIRCLE_JOB -DCMAKE_TOOLCHAIN_FILE=/opt/android/ndk-bundle/build/cmake/android.toolchain.cmake -DANDROID_CCACHE=/usr/bin/ccache -DANDROID_ABI=x86'
-          build_params: '--target libmapbox-gl.so'
+          build_params: '--target libmbgl-render-test-runner.so'
           install: true
       - build-template:
           name: android-x86_64-release
@@ -48,7 +48,7 @@ workflows:
           requires:
             - sanity-checks
           config_params: '-G Ninja -DCMAKE_INSTALL_PREFIX=/tmp/workspace/install/$CIRCLE_JOB -DCMAKE_TOOLCHAIN_FILE=/opt/android/ndk-bundle/build/cmake/android.toolchain.cmake -DANDROID_CCACHE=/usr/bin/ccache -DANDROID_ABI=x86_64'
-          build_params: '--target libmapbox-gl.so'
+          build_params: '--target libmbgl-render-test-runner.so'
           install: true
       - build-template:
           name: linux-gcc8-release
diff --git a/metrics/binary-size/android-arm64-v8a/metrics.json b/metrics/binary-size/android-arm64-v8a/metrics.json
index 262799af88..9f84422fa5 100644
--- a/metrics/binary-size/android-arm64-v8a/metrics.json
+++ b/metrics/binary-size/android-arm64-v8a/metrics.json
@@ -2,7 +2,7 @@
     "file-size": [
         [
             "android-arm64-v8a",
-            "/tmp/attach/install/android-arm64-v8a-release/lib/libmapbox-gl.so",
+            "/tmp/attach/install/android-arm64-v8a-release/lib/libmbgl-render-test-runner.so",
             1972354
         ]
     ]
diff --git a/metrics/binary-size/android-arm64-v8a/style.json b/metrics/binary-size/android-arm64-v8a/style.json
index dd883d579b..1558baee0d 100644
--- a/metrics/binary-size/android-arm64-v8a/style.json
+++ b/metrics/binary-size/android-arm64-v8a/style.json
@@ -3,7 +3,7 @@
   "metadata": {
     "test": {
       "operations": [
-        ["probeFileSize", "android-arm64-v8a", "/tmp/attach/install/android-arm64-v8a-release/lib/libmapbox-gl.so", 0.01, "compressed"]
+        ["probeFileSize", "android-arm64-v8a", "/tmp/attach/install/android-arm64-v8a-release/lib/libmbgl-render-test-runner.so", 0.01, "compressed"]
       ],
       "width": 64,
       "height": 64
diff --git a/metrics/binary-size/android-armeabi-v7a/metrics.json b/metrics/binary-size/android-armeabi-v7a/metrics.json
index 5ef1944ca3..1c77a86918 100644
--- a/metrics/binary-size/android-armeabi-v7a/metrics.json
+++ b/metrics/binary-size/android-armeabi-v7a/metrics.json
@@ -2,7 +2,7 @@
     "file-size": [
         [
             "android-armeabi-v7a",
-            "/tmp/attach/install/android-armeabi-v7a-release/lib/libmapbox-gl.so",
+            "/tmp/attach/install/android-armeabi-v7a-release/lib/libmbgl-render-test-runner.so",
             1664652
         ]
     ]
diff --git a/metrics/binary-size/android-armeabi-v7a/style.json b/metrics/binary-size/android-armeabi-v7a/style.json
index 66e1fc1b66..23c4f2f7bd 100644
--- a/metrics/binary-size/android-armeabi-v7a/style.json
+++ b/metrics/binary-size/android-armeabi-v7a/style.json
@@ -3,7 +3,7 @@
   "metadata": {
     "test": {
       "operations": [
-        ["probeFileSize", "android-armeabi-v7a", "/tmp/attach/install/android-armeabi-v7a-release/lib/libmapbox-gl.so", 0.01, "compressed"]
+        ["probeFileSize", "android-armeabi-v7a", "/tmp/attach/install/android-armeabi-v7a-release/lib/libmbgl-render-test-runner.so", 0.01, "compressed"]
       ],
       "width": 64,
       "height": 64
diff --git a/metrics/binary-size/android-x86/metrics.json b/metrics/binary-size/android-x86/metrics.json
index 1497e12c08..6d1328d777 100644
--- a/metrics/binary-size/android-x86/metrics.json
+++ b/metrics/binary-size/android-x86/metrics.json
@@ -2,7 +2,7 @@
     "file-size": [
         [
             "android-x86",
-            "/tmp/attach/install/android-x86-release/lib/libmapbox-gl.so",
+            "/tmp/attach/install/android-x86-release/lib/libmbgl-render-test-runner.so",
             1997677
         ]
     ]
diff --git a/metrics/binary-size/android-x86/style.json b/metrics/binary-size/android-x86/style.json
index a2eebe4fec..a025648b7f 100644
--- a/metrics/binary-size/android-x86/style.json
+++ b/metrics/binary-size/android-x86/style.json
@@ -3,7 +3,7 @@
   "metadata": {
     "test": {
       "operations": [
-        ["probeFileSize", "android-x86", "/tmp/attach/install/android-x86-release/lib/libmapbox-gl.so", 0.01, "compressed"]
+        ["probeFileSize", "android-x86", "/tmp/attach/install/android-x86-release/lib/libmbgl-render-test-runner.so", 0.01, "compressed"]
       ],
       "width": 64,
       "height": 64
diff --git a/metrics/binary-size/android-x86_64/metrics.json b/metrics/binary-size/android-x86_64/metrics.json
index a0d4d29249..a8d1e1e22d 100644
--- a/metrics/binary-size/android-x86_64/metrics.json
+++ b/metrics/binary-size/android-x86_64/metrics.json
@@ -2,7 +2,7 @@
     "file-size": [
         [
             "android-x86_64",
-            "/tmp/attach/install/android-x86_64-release/lib/libmapbox-gl.so",
+            "/tmp/attach/install/android-x86_64-release/lib/libmbgl-render-test-runner.so",
             2008352
         ]
     ]
diff --git a/metrics/binary-size/android-x86_64/style.json b/metrics/binary-size/android-x86_64/style.json
index a27af4bd66..4080f27c5a 100644
--- a/metrics/binary-size/android-x86_64/style.json
+++ b/metrics/binary-size/android-x86_64/style.json
@@ -3,7 +3,7 @@
   "metadata": {
     "test": {
       "operations": [
-        ["probeFileSize", "android-x86_64", "/tmp/attach/install/android-x86_64-release/lib/libmapbox-gl.so", 0.01, "compressed"]
+        ["probeFileSize", "android-x86_64", "/tmp/attach/install/android-x86_64-release/lib/libmbgl-render-test-runner.so", 0.01, "compressed"]
       ],
       "width": 64,
       "height": 64
diff --git a/platform/android/android.cmake b/platform/android/android.cmake
index 89f3860dfb..fd6d9e7348 100644
--- a/platform/android/android.cmake
+++ b/platform/android/android.cmake
@@ -30,20 +30,6 @@ target_link_libraries(
 target_sources(
     mbgl-core
     PRIVATE
-        ${PROJECT_SOURCE_DIR}/platform/android/src/android_renderer_backend.cpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/android_renderer_backend.hpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/android_renderer_frontend.cpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/android_renderer_frontend.hpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/annotation/marker.cpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/annotation/marker.hpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/annotation/multi_point.hpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/annotation/polygon.cpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/annotation/polygon.hpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/annotation/polyline.cpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/annotation/polyline.hpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/asset_manager.hpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/asset_manager_file_source.cpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/asset_manager_file_source.hpp
         ${PROJECT_SOURCE_DIR}/platform/android/src/async_task.cpp
         ${PROJECT_SOURCE_DIR}/platform/android/src/attach_env.cpp
         ${PROJECT_SOURCE_DIR}/platform/android/src/attach_env.hpp
@@ -51,158 +37,13 @@ target_sources(
         ${PROJECT_SOURCE_DIR}/platform/android/src/bitmap.hpp
         ${PROJECT_SOURCE_DIR}/platform/android/src/bitmap_factory.cpp
         ${PROJECT_SOURCE_DIR}/platform/android/src/bitmap_factory.hpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/connectivity_listener.cpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/connectivity_listener.hpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/conversion/collection.cpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/conversion/collection.hpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/conversion/color.cpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/conversion/color.hpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/conversion/constant.cpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/conversion/constant.hpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/conversion/conversion.hpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/geojson/feature.cpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/geojson/feature.hpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/geojson/feature_collection.cpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/geojson/feature_collection.hpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/geojson/geometry.cpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/geojson/geometry.hpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/geojson/geometry_collection.cpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/geojson/geometry_collection.hpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/geojson/line_string.cpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/geojson/line_string.hpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/geojson/multi_line_string.cpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/geojson/multi_line_string.hpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/geojson/multi_point.cpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/geojson/multi_point.hpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/geojson/multi_polygon.cpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/geojson/multi_polygon.hpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/geojson/point.cpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/geojson/point.hpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/geojson/polygon.cpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/geojson/polygon.hpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/geojson/util.hpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/geometry/lat_lng.cpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/geometry/lat_lng.hpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/geometry/lat_lng_bounds.cpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/geometry/lat_lng_bounds.hpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/geometry/lat_lng_quad.cpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/geometry/lat_lng_quad.hpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/geometry/projected_meters.cpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/geometry/projected_meters.hpp
         ${PROJECT_SOURCE_DIR}/platform/android/src/gl_functions.cpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/graphics/pointf.cpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/graphics/pointf.hpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/graphics/rectf.cpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/graphics/rectf.hpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/gson/json_array.cpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/gson/json_array.hpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/gson/json_element.cpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/gson/json_element.hpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/gson/json_object.cpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/gson/json_object.hpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/gson/json_primitive.cpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/gson/json_primitive.hpp
         ${PROJECT_SOURCE_DIR}/platform/android/src/image.cpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/java/util.cpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/java/util.hpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/java_types.cpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/java_types.hpp
         ${PROJECT_SOURCE_DIR}/platform/android/src/jni.cpp
         ${PROJECT_SOURCE_DIR}/platform/android/src/jni.hpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/jni_native.cpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/jni_native.hpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/mapbox.cpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/mapbox.hpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/map/camera_position.cpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/map/camera_position.hpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/map/image.cpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/map/image.hpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/map_renderer.cpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/map_renderer.hpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/map_renderer_runnable.cpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/map_renderer_runnable.hpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/native_map_view.cpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/native_map_view.hpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/offline/offline_manager.cpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/offline/offline_manager.hpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/offline/offline_region.cpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/offline/offline_region.hpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/offline/offline_region_definition.cpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/offline/offline_region_definition.hpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/offline/offline_region_error.cpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/offline/offline_region_error.hpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/offline/offline_region_status.cpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/offline/offline_region_status.hpp
         ${PROJECT_SOURCE_DIR}/platform/android/src/run_loop.cpp
         ${PROJECT_SOURCE_DIR}/platform/android/src/run_loop_impl.hpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/snapshotter/map_snapshot.cpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/snapshotter/map_snapshot.hpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/snapshotter/map_snapshotter.cpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/snapshotter/map_snapshotter.hpp
         ${PROJECT_SOURCE_DIR}/platform/android/src/string_util.cpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/style/android_conversion.hpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/style/conversion/filter.cpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/style/conversion/filter.hpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/style/conversion/position.cpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/style/conversion/position.hpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/style/conversion/property_expression.hpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/style/conversion/property_value.hpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/style/conversion/transition_options.cpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/style/conversion/transition_options.hpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/style/conversion/url_or_tileset.cpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/style/conversion/url_or_tileset.hpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/style/formatted.cpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/style/formatted.hpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/style/formatted_section.cpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/style/formatted_section.hpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/style/layers/background_layer.cpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/style/layers/background_layer.hpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/style/layers/circle_layer.cpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/style/layers/circle_layer.hpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/style/layers/custom_layer.cpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/style/layers/custom_layer.hpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/style/layers/fill_extrusion_layer.cpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/style/layers/fill_extrusion_layer.hpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/style/layers/fill_layer.cpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/style/layers/fill_layer.hpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/style/layers/heatmap_layer.cpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/style/layers/heatmap_layer.hpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/style/layers/hillshade_layer.cpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/style/layers/hillshade_layer.hpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/style/layers/layer.cpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/style/layers/layer.hpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/style/layers/layer_manager.cpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/style/layers/layer_manager.hpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/style/layers/line_layer.cpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/style/layers/line_layer.hpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/style/layers/raster_layer.cpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/style/layers/raster_layer.hpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/style/layers/symbol_layer.cpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/style/layers/symbol_layer.hpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/style/light.cpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/style/light.hpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/style/position.cpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/style/position.hpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/style/sources/custom_geometry_source.cpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/style/sources/custom_geometry_source.hpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/style/sources/geojson_source.cpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/style/sources/geojson_source.hpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/style/sources/image_source.cpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/style/sources/image_source.hpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/style/sources/raster_dem_source.cpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/style/sources/raster_dem_source.hpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/style/sources/raster_source.cpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/style/sources/raster_source.hpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/style/sources/source.cpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/style/sources/source.hpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/style/sources/unknown_source.cpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/style/sources/unknown_source.hpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/style/sources/vector_source.cpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/style/sources/vector_source.hpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/style/transition_options.cpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/style/transition_options.hpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/style/value.cpp
-        ${PROJECT_SOURCE_DIR}/platform/android/src/style/value.hpp
         ${PROJECT_SOURCE_DIR}/platform/android/src/thread.cpp
         ${PROJECT_SOURCE_DIR}/platform/android/src/timer.cpp
         ${PROJECT_SOURCE_DIR}/platform/default/src/mbgl/gfx/headless_backend.cpp
@@ -227,6 +68,7 @@ target_sources(
         ${PROJECT_SOURCE_DIR}/platform/default/src/mbgl/util/png_writer.cpp
         ${PROJECT_SOURCE_DIR}/platform/default/src/mbgl/util/thread_local.cpp
         ${PROJECT_SOURCE_DIR}/platform/default/src/mbgl/util/utf.cpp
+        ${PROJECT_SOURCE_DIR}/platform/default/src/mbgl/layermanager/layer_manager.cpp
         ${PROJECT_SOURCE_DIR}/platform/linux/src/headless_backend_egl.cpp
 )
 
@@ -251,51 +93,6 @@ target_link_libraries(
 )
 
 add_library(
-    mbgl-core-android STATIC
-    ${PROJECT_SOURCE_DIR}/platform/android/src/file_source.cpp
-    ${PROJECT_SOURCE_DIR}/platform/android/src/file_source.hpp
-    ${PROJECT_SOURCE_DIR}/platform/android/src/http_file_source.cpp
-    ${PROJECT_SOURCE_DIR}/platform/android/src/i18n/collator.cpp
-    ${PROJECT_SOURCE_DIR}/platform/android/src/i18n/collator_jni.hpp
-    ${PROJECT_SOURCE_DIR}/platform/android/src/i18n/number_format.cpp
-    ${PROJECT_SOURCE_DIR}/platform/android/src/i18n/number_format_jni.hpp
-    ${PROJECT_SOURCE_DIR}/platform/android/src/logger.cpp
-    ${PROJECT_SOURCE_DIR}/platform/android/src/logger.hpp
-    ${PROJECT_SOURCE_DIR}/platform/android/src/logging_android.cpp
-    ${PROJECT_SOURCE_DIR}/platform/android/src/text/local_glyph_rasterizer.cpp
-    ${PROJECT_SOURCE_DIR}/platform/android/src/text/local_glyph_rasterizer_jni.hpp
-)
-
-target_include_directories(
-    mbgl-core-android
-    PRIVATE ${PROJECT_SOURCE_DIR}/platform/default/include ${PROJECT_SOURCE_DIR}/src
-)
-
-target_link_libraries(
-    mbgl-core-android
-    PRIVATE Mapbox::Base::jni.hpp mbgl-compiler-options mbgl-core
-)
-
-add_library(
-    mapbox-gl SHARED
-    ${PROJECT_SOURCE_DIR}/platform/android/src/main.cpp
-)
-
-target_include_directories(
-    mapbox-gl
-    PRIVATE ${PROJECT_SOURCE_DIR}/platform/default/include ${PROJECT_SOURCE_DIR}/src
-)
-
-target_link_libraries(
-    mapbox-gl
-    PRIVATE
-        Mapbox::Base::jni.hpp
-        mbgl-compiler-options
-        mbgl-core
-        mbgl-core-android
-)
-
-add_library(
     example-custom-layer MODULE
     ${PROJECT_SOURCE_DIR}/platform/android/src/example_custom_layer.cpp
 )
@@ -470,4 +267,4 @@ add_custom_command(
     WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
 )
 
-install(TARGETS mapbox-gl LIBRARY DESTINATION lib)
+install(TARGETS mbgl-render-test-runner LIBRARY DESTINATION lib)
diff --git a/platform/android/src/android_renderer_backend.cpp b/platform/android/src/android_renderer_backend.cpp
deleted file mode 100755
index e2d0648385..0000000000
--- a/platform/android/src/android_renderer_backend.cpp
+++ /dev/null
@@ -1,67 +0,0 @@
-#include "android_renderer_backend.hpp"
-
-#include <mbgl/gfx/backend_scope.hpp>
-#include <mbgl/gl/context.hpp>
-#include <mbgl/gl/renderable_resource.hpp>
-
-#include <EGL/egl.h>
-
-#include <cassert>
-
-namespace mbgl {
-namespace android {
-
-class AndroidGLRenderableResource final : public mbgl::gl::RenderableResource {
-public:
-    AndroidGLRenderableResource(AndroidRendererBackend& backend_) : backend(backend_) {
-    }
-
-    void bind() override {
-        assert(gfx::BackendScope::exists());
-        backend.setFramebufferBinding(0);
-        backend.setViewport(0, 0, backend.getSize());
-    }
-
-private:
-    AndroidRendererBackend& backend;
-};
-
-AndroidRendererBackend::AndroidRendererBackend()
-    : gl::RendererBackend(gfx::ContextMode::Unique),
-      mbgl::gfx::Renderable({ 64, 64 }, std::make_unique<AndroidGLRenderableResource>(*this)) {
-}
-
-AndroidRendererBackend::~AndroidRendererBackend() = default;
-
-gl::ProcAddress AndroidRendererBackend::getExtensionFunctionPointer(const char* name) {
-    assert(gfx::BackendScope::exists());
-    return eglGetProcAddress(name);
-}
-
-void AndroidRendererBackend::updateViewPort() {
-    assert(gfx::BackendScope::exists());
-    setViewport(0, 0, size);
-}
-
-void AndroidRendererBackend::resizeFramebuffer(int width, int height) {
-    size = { static_cast<uint32_t>(width), static_cast<uint32_t>(height) };
-}
-
-PremultipliedImage AndroidRendererBackend::readFramebuffer() {
-    assert(gfx::BackendScope::exists());
-    return gl::RendererBackend::readFramebuffer(size);
-}
-
-void AndroidRendererBackend::updateAssumedState() {
-    assumeFramebufferBinding(0);
-    assumeViewport(0, 0, size);
-}
-
-void AndroidRendererBackend::markContextLost() {
-    if (context) {
-        getContext<gl::Context>().setCleanupOnDestruction(false);
-    }
-}
-
-} // namespace android
-} // namspace mbgl
diff --git a/platform/android/src/android_renderer_backend.hpp b/platform/android/src/android_renderer_backend.hpp
deleted file mode 100755
index f06f38e688..0000000000
--- a/platform/android/src/android_renderer_backend.hpp
+++ /dev/null
@@ -1,43 +0,0 @@
-#pragma once
-
-#include <mbgl/gfx/renderable.hpp>
-#include <mbgl/gl/renderer_backend.hpp>
-
-namespace mbgl {
-namespace android {
-
-class AndroidRendererBackend : public gl::RendererBackend, public mbgl::gfx::Renderable {
-public:
-    AndroidRendererBackend();
-    ~AndroidRendererBackend() override;
-
-    void updateViewPort();
-
-    // Ensures the current context is not cleaned up when destroyed
-    void markContextLost();
-
-    void resizeFramebuffer(int width, int height);
-    PremultipliedImage readFramebuffer();
-
-    // mbgl::gfx::RendererBackend implementation
-public:
-    mbgl::gfx::Renderable& getDefaultRenderable() override {
-        return *this;
-    }
-
-protected:
-    void activate() override {
-        // no-op
-    }
-    void deactivate() override {
-        // no-op
-    }
-
-    // mbgl::gl::RendererBackend implementation
-protected:
-    mbgl::gl::ProcAddress getExtensionFunctionPointer(const char*) override;
-    void updateAssumedState() override;
-};
-
-} // namespace android
-} // namespace mbgl
diff --git a/platform/android/src/android_renderer_frontend.cpp b/platform/android/src/android_renderer_frontend.cpp
deleted file mode 100644
index d1a2624f0d..0000000000
--- a/platform/android/src/android_renderer_frontend.cpp
+++ /dev/null
@@ -1,143 +0,0 @@
-#include "android_renderer_frontend.hpp"
-
-#include <mbgl/actor/scheduler.hpp>
-#include <mbgl/renderer/renderer.hpp>
-#include <mbgl/renderer/renderer_observer.hpp>
-#include <mbgl/util/async_task.hpp>
-#include <mbgl/util/thread.hpp>
-#include <mbgl/util/run_loop.hpp>
-#include <mbgl/util/geojson.hpp>
-
-#include "android_renderer_backend.hpp"
-
-namespace mbgl {
-namespace android {
-
-// Forwards RendererObserver signals to the given
-// Delegate RendererObserver on the given RunLoop
-class ForwardingRendererObserver : public RendererObserver {
-public:
-    ForwardingRendererObserver(util::RunLoop& mapRunLoop, RendererObserver& delegate_)
-            : mailbox(std::make_shared<Mailbox>(mapRunLoop))
-            , delegate(delegate_, mailbox) {
-    }
-
-    ~ForwardingRendererObserver() {
-        mailbox->close();
-    }
-
-    void onInvalidate() override {
-        delegate.invoke(&RendererObserver::onInvalidate);
-    }
-
-    void onResourceError(std::exception_ptr err) override {
-        delegate.invoke(&RendererObserver::onResourceError, err);
-    }
-
-    void onWillStartRenderingMap() override {
-        delegate.invoke(&RendererObserver::onWillStartRenderingMap);
-    }
-
-    void onWillStartRenderingFrame() override {
-        delegate.invoke(&RendererObserver::onWillStartRenderingFrame);
-    }
-
-    void onDidFinishRenderingFrame(RenderMode mode, bool repaintNeeded, bool placementChanged) override {
-        delegate.invoke(&RendererObserver::onDidFinishRenderingFrame, mode, repaintNeeded, placementChanged);
-    }
-
-    void onDidFinishRenderingMap() override {
-        delegate.invoke(&RendererObserver::onDidFinishRenderingMap);
-    }
-
-    void onStyleImageMissing(const std::string& id, StyleImageMissingCallback done) override {
-        delegate.invoke(&RendererObserver::onStyleImageMissing, id, done);
-    }
-
-    void onRemoveUnusedStyleImages(const std::vector<std::string>& ids) override {
-        delegate.invoke(&RendererObserver::onRemoveUnusedStyleImages, ids);
-    }
-
-private:
-    std::shared_ptr<Mailbox> mailbox;
-    ActorRef<RendererObserver> delegate;
-};
-
-AndroidRendererFrontend::AndroidRendererFrontend(MapRenderer& mapRenderer_)
-        : mapRenderer(mapRenderer_)
-        , mapRunLoop(util::RunLoop::Get())
-        , updateAsyncTask(std::make_unique<util::AsyncTask>([this]() {
-              mapRenderer.update(std::move(updateParams));
-              mapRenderer.requestRender();
-          })) {
-}
-
-AndroidRendererFrontend::~AndroidRendererFrontend() = default;
-
-void AndroidRendererFrontend::reset() {
-    mapRenderer.reset();
-}
-
-void AndroidRendererFrontend::setObserver(RendererObserver& observer) {
-    assert (util::RunLoop::Get());
-    // Don't call the Renderer directly, but use MapRenderer#setObserver to make sure
-    // the Renderer may be re-initialised without losing the RendererObserver reference.
-    mapRenderer.setObserver(std::make_unique<ForwardingRendererObserver>(*mapRunLoop, observer));
-}
-
-void AndroidRendererFrontend::update(std::shared_ptr<UpdateParameters> params) {
-    updateParams = std::move(params);
-    updateAsyncTask->send();
-}
-
-void AndroidRendererFrontend::reduceMemoryUse() {
-    mapRenderer.actor().invoke(&Renderer::reduceMemoryUse);
-}
-
-std::vector<Feature> AndroidRendererFrontend::querySourceFeatures(const std::string& sourceID,
-                                                                  const SourceQueryOptions& options) const {
-    // Waits for the result from the orchestration thread and returns
-    return mapRenderer.actor().ask(&Renderer::querySourceFeatures, sourceID, options).get();
-}
-
-std::vector<Feature> AndroidRendererFrontend::queryRenderedFeatures(const ScreenBox& box,
-                                                                    const RenderedQueryOptions& options) const {
-
-    // Select the right overloaded method
-    std::vector<Feature> (Renderer::*fn)(const ScreenBox&, const RenderedQueryOptions&) const = &Renderer::queryRenderedFeatures;
-
-    // Waits for the result from the orchestration thread and returns
-    return mapRenderer.actor().ask(fn, box, options).get();
-}
-
-std::vector<Feature> AndroidRendererFrontend::queryRenderedFeatures(const ScreenCoordinate& point,
-                                                                    const RenderedQueryOptions& options) const {
-
-    // Select the right overloaded method
-    std::vector<Feature> (Renderer::*fn)(const ScreenCoordinate&, const RenderedQueryOptions&) const = &Renderer::queryRenderedFeatures;
-
-    // Waits for the result from the orchestration thread and returns
-    return mapRenderer.actor().ask(fn, point, options).get();
-}
-
-AnnotationIDs AndroidRendererFrontend::queryPointAnnotations(const ScreenBox& box) const {
-    // Waits for the result from the orchestration thread and returns
-    return mapRenderer.actor().ask(&Renderer::queryPointAnnotations, box).get();
-}
-
-AnnotationIDs AndroidRendererFrontend::queryShapeAnnotations(const ScreenBox& box) const {
-    // Waits for the result from the orchestration thread and returns
-    return mapRenderer.actor().ask(&Renderer::queryShapeAnnotations, box).get();
-}
-
-FeatureExtensionValue AndroidRendererFrontend::queryFeatureExtensions(const std::string& sourceID,
-                                                     const Feature& feature,
-                                                     const std::string& extension,
-                                                     const std::string& extensionField,
-                                                     const optional<std::map<std::string, mbgl::Value>>& args) const {
-    return mapRenderer.actor().ask(&Renderer::queryFeatureExtensions, sourceID, feature, extension, extensionField, args).get();
-}
-
-} // namespace android
-} // namespace mbgl
-
diff --git a/platform/android/src/android_renderer_frontend.hpp b/platform/android/src/android_renderer_frontend.hpp
deleted file mode 100644
index dc5f11e57e..0000000000
--- a/platform/android/src/android_renderer_frontend.hpp
+++ /dev/null
@@ -1,68 +0,0 @@
-#pragma once
-
-#include <mbgl/actor/actor.hpp>
-#include <mbgl/annotation/annotation.hpp>
-#include <mbgl/renderer/renderer_frontend.hpp>
-#include <mbgl/util/geo.hpp>
-#include <mbgl/util/run_loop.hpp>
-
-#include <functional>
-#include <memory>
-#include <vector>
-#include <string>
-#include <mbgl/util/geojson.hpp>
-
-#include "map_renderer.hpp"
-
-namespace mbgl {
-
-class RenderedQueryOptions;
-class SourceQueryOptions;
-
-namespace util {
-
-class AsyncTask;
-
-} // namespace util
-
-namespace android {
-
-class AndroidRendererFrontend : public RendererFrontend {
-public:
-
-    AndroidRendererFrontend(MapRenderer&);
-    ~AndroidRendererFrontend() override;
-
-    void reset() override;
-    void setObserver(RendererObserver&) override;
-
-    void update(std::shared_ptr<UpdateParameters>) override;
-
-    // Feature querying
-    std::vector<Feature> queryRenderedFeatures(const ScreenCoordinate&, const RenderedQueryOptions&) const;
-    std::vector<Feature> queryRenderedFeatures(const ScreenBox&, const RenderedQueryOptions&) const;
-    std::vector<Feature> querySourceFeatures(const std::string& sourceID, const SourceQueryOptions&) const;
-    AnnotationIDs queryPointAnnotations(const ScreenBox& box) const;
-    AnnotationIDs queryShapeAnnotations(const ScreenBox& box) const;
-
-
-    // Feature extension query
-    FeatureExtensionValue
-    queryFeatureExtensions(const std::string& sourceID,
-                           const Feature& feature,
-                           const std::string& extension,
-                           const std::string& extensionField,
-                           const optional<std::map<std::string, mbgl::Value>>& args) const;
-
-    // Memory
-    void reduceMemoryUse();
-
-private:
-    MapRenderer& mapRenderer;
-    util::RunLoop* mapRunLoop;
-    std::unique_ptr<util::AsyncTask> updateAsyncTask;
-    std::shared_ptr<UpdateParameters> updateParams;
-};
-
-} // namespace android
-} // namespace mbgl
diff --git a/platform/android/src/annotation/marker.cpp b/platform/android/src/annotation/marker.cpp
deleted file mode 100644
index 899f87a74f..0000000000
--- a/platform/android/src/annotation/marker.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-#include "marker.hpp"
-
-namespace mbgl {
-namespace android {
-
-mbgl::Point<double> Marker::getPosition(jni::JNIEnv& env, const jni::Object<Marker>& marker) {
-    static auto& javaClass = jni::Class<Marker>::Singleton(env);
-    static auto positionField = javaClass.GetField<jni::Object<LatLng>>(env, "position");
-    return LatLng::getGeometry(env, marker.Get(env, positionField));
-}
-
-std::string Marker::getIconId(jni::JNIEnv& env, const jni::Object<Marker>& marker) {
-    static auto& javaClass = jni::Class<Marker>::Singleton(env);
-    static auto iconIdField = javaClass.GetField<jni::String>(env, "iconId");
-    return jni::Make<std::string>(env, marker.Get(env, iconIdField));
-}
-
-void Marker::registerNative(jni::JNIEnv& env) {
-    jni::Class<Marker>::Singleton(env);
-}
-
-} // namespace android
-} // namespace mbgl
\ No newline at end of file
diff --git a/platform/android/src/annotation/marker.hpp b/platform/android/src/annotation/marker.hpp
deleted file mode 100644
index b38a25b4fb..0000000000
--- a/platform/android/src/annotation/marker.hpp
+++ /dev/null
@@ -1,28 +0,0 @@
-#pragma once
-
-#include <mbgl/util/noncopyable.hpp>
-#include <jni/jni.hpp>
-
-#include <string>
-
-#include "../geometry/lat_lng.hpp"
-
-namespace mbgl {
-namespace android {
-
-class Marker : private mbgl::util::noncopyable {
-public:
-
-    static constexpr auto Name() { return "com/mapbox/mapboxsdk/annotations/Marker"; };
-
-    static mbgl::Point<double> getPosition(jni::JNIEnv&, const jni::Object<Marker>&);
-
-    static std::string getIconId(jni::JNIEnv&, const jni::Object<Marker>&);
-
-    static void registerNative(jni::JNIEnv&);
-
-};
-
-
-} // namespace android
-} // namespace mbgl
\ No newline at end of file
diff --git a/platform/android/src/annotation/multi_point.hpp b/platform/android/src/annotation/multi_point.hpp
deleted file mode 100644
index 20f1b3eaf2..0000000000
--- a/platform/android/src/annotation/multi_point.hpp
+++ /dev/null
@@ -1,34 +0,0 @@
-#pragma once
-
-#include <mbgl/util/noncopyable.hpp>
-#include <jni/jni.hpp>
-
-#include "../geometry/lat_lng.hpp"
-#include "../java/util.hpp"
-
-namespace mbgl {
-namespace android {
-
-class MultiPoint : protected mbgl::util::noncopyable {
-
-protected:
-
-  template <class Geometry>
-  static Geometry toGeometry(JNIEnv& env, const jni::Object<java::util::List>& pointsList) {
-      auto jarray = java::util::List::toArray<LatLng>(env, pointsList);
-
-      std::size_t size = jarray.Length(env);
-
-      Geometry geometry;
-      geometry.reserve(size);
-
-      for (std::size_t i = 0; i < size; i++) {
-          geometry.push_back(LatLng::getGeometry(env, jarray.Get(env, i)));
-      }
-
-      return geometry;
-  }
-};
-
-} // namespace android
-} // namespace mbgl
\ No newline at end of file
diff --git a/platform/android/src/annotation/polygon.cpp b/platform/android/src/annotation/polygon.cpp
deleted file mode 100644
index f22cffb100..0000000000
--- a/platform/android/src/annotation/polygon.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-#include "polygon.hpp"
-
-#include "../conversion/color.hpp"
-
-namespace mbgl {
-namespace android {
-
-mbgl::FillAnnotation Polygon::toAnnotation(jni::JNIEnv& env, const jni::Object<Polygon>& polygon) {
-    static auto& javaClass = jni::Class<Polygon>::Singleton(env);
-    static auto points = javaClass.GetField<jni::Object<java::util::List>>(env, "points");
-    static auto holes = javaClass.GetField<jni::Object<java::util::List>>(env, "holes");
-    static auto alpha = javaClass.GetField<float>(env, "alpha");
-    static auto fillColor = javaClass.GetField<int>(env, "fillColor");
-    static auto strokeColor = javaClass.GetField<int>(env, "strokeColor");
-
-    mbgl::Polygon<double> geometry {
-        MultiPoint::toGeometry<mbgl::LinearRing<double>>(env, polygon.Get(env, points))
-    };
-
-    auto jHoleListsArray = java::util::List::toArray<java::util::List>(env, polygon.Get(env, holes));
-
-    std::size_t jHoleListsSize = jHoleListsArray.Length(env);
-    for (std::size_t i = 0; i < jHoleListsSize; i++) {
-        geometry.push_back(MultiPoint::toGeometry<mbgl::LinearRing<double>>(env, jHoleListsArray.Get(env, i)));
-    }
-
-    mbgl::FillAnnotation annotation { geometry };
-    annotation.opacity = polygon.Get(env, alpha);
-    annotation.color = *conversion::convert<mbgl::Color>(env, polygon.Get(env, fillColor));
-    annotation.outlineColor = *conversion::convert<mbgl::Color>(env, polygon.Get(env, strokeColor));
-
-    return annotation;
-}
-
-void Polygon::registerNative(jni::JNIEnv& env) {
-    jni::Class<Polygon>::Singleton(env);
-}
-
-} // namespace android
-} // namespace mbgl
\ No newline at end of file
diff --git a/platform/android/src/annotation/polygon.hpp b/platform/android/src/annotation/polygon.hpp
deleted file mode 100644
index bc21878ef3..0000000000
--- a/platform/android/src/annotation/polygon.hpp
+++ /dev/null
@@ -1,21 +0,0 @@
-#pragma once
-
-#include <mbgl/annotation/annotation.hpp>
-
-#include "multi_point.hpp"
-
-namespace mbgl {
-namespace android {
-
-class Polygon : private MultiPoint {
-public:
-    static constexpr auto Name() { return "com/mapbox/mapboxsdk/annotations/Polygon"; };
-
-    static mbgl::FillAnnotation toAnnotation(jni::JNIEnv&, const jni::Object<Polygon>&);
-
-    static void registerNative(jni::JNIEnv&);
-};
-
-
-} // namespace android
-} // namespace mbgl
\ No newline at end of file
diff --git a/platform/android/src/annotation/polyline.cpp b/platform/android/src/annotation/polyline.cpp
deleted file mode 100644
index d6161e856e..0000000000
--- a/platform/android/src/annotation/polyline.cpp
+++ /dev/null
@@ -1,31 +0,0 @@
-#include "polyline.hpp"
-
-#include "../conversion/color.hpp"
-
-namespace mbgl {
-namespace android {
-
-mbgl::LineAnnotation Polyline::toAnnotation(jni::JNIEnv& env, const jni::Object<Polyline>& polyline) {
-    static auto& javaClass = jni::Class<Polyline>::Singleton(env);
-    static auto points = javaClass.GetField<jni::Object<java::util::List>>(env, "points");
-    static auto alpha = javaClass.GetField<float>(env, "alpha");
-    static auto color = javaClass.GetField<int>(env, "color");
-    static auto width = javaClass.GetField<float>(env, "width");
-
-    mbgl::LineAnnotation annotation {
-        MultiPoint::toGeometry<mbgl::LineString<double>>(env, polyline.Get(env, points))
-    };
-
-    annotation.opacity = polyline.Get(env, alpha);
-    annotation.color = *conversion::convert<mbgl::Color>(env, polyline.Get(env, color));
-    annotation.width = polyline.Get(env, width);
-
-    return annotation;
-}
-
-void Polyline::registerNative(jni::JNIEnv& env) {
-    jni::Class<Polyline>::Singleton(env);
-}
-
-} // namespace android
-} // namespace mbgl
\ No newline at end of file
diff --git a/platform/android/src/annotation/polyline.hpp b/platform/android/src/annotation/polyline.hpp
deleted file mode 100644
index 6178e98cfc..0000000000
--- a/platform/android/src/annotation/polyline.hpp
+++ /dev/null
@@ -1,21 +0,0 @@
-#pragma once
-
-#include <mbgl/annotation/annotation.hpp>
-
-#include "multi_point.hpp"
-
-namespace mbgl {
-namespace android {
-
-class Polyline : private MultiPoint {
-public:
-    static constexpr auto Name() { return "com/mapbox/mapboxsdk/annotations/Polyline"; };
-
-    static mbgl::LineAnnotation toAnnotation(jni::JNIEnv&, const jni::Object<Polyline>&);
-
-    static void registerNative(jni::JNIEnv&);
-};
-
-
-} // namespace android
-} // namespace mbgl
\ No newline at end of file
diff --git a/platform/android/src/asset_manager.hpp b/platform/android/src/asset_manager.hpp
deleted file mode 100644
index b87d189514..0000000000
--- a/platform/android/src/asset_manager.hpp
+++ /dev/null
@@ -1,14 +0,0 @@
-#pragma once
-
-namespace mbgl {
-namespace android {
-
-class AssetManager {
-public:
-    static constexpr auto Name() {
-        return "android/content/res/AssetManager";
-    };
-};
-
-} // namespace android
-} // namespace mbgl
diff --git a/platform/android/src/asset_manager_file_source.cpp b/platform/android/src/asset_manager_file_source.cpp
deleted file mode 100644
index a8045a2b96..0000000000
--- a/platform/android/src/asset_manager_file_source.cpp
+++ /dev/null
@@ -1,65 +0,0 @@
-#include "asset_manager_file_source.hpp"
-
-#include <mbgl/platform/settings.hpp>
-#include <mbgl/storage/file_source_request.hpp>
-#include <mbgl/storage/resource.hpp>
-#include <mbgl/storage/response.hpp>
-#include <mbgl/util/thread.hpp>
-#include <mbgl/util/url.hpp>
-#include <mbgl/util/util.hpp>
-
-#include <android/asset_manager.h>
-#include <android/asset_manager_jni.h>
-
-namespace mbgl {
-
-class AssetManagerFileSource::Impl {
-public:
-    Impl(ActorRef<Impl>, AAssetManager* assetManager_) : assetManager(assetManager_) {
-    }
-
-    void request(const std::string& url, ActorRef<FileSourceRequest> req) {
-        // Note: AssetManager already prepends "assets" to the filename.
-        const std::string path = mbgl::util::percentDecode(url.substr(8));
-
-        Response response;
-
-        if (AAsset* asset = AAssetManager_open(assetManager, path.c_str(), AASSET_MODE_BUFFER)) {
-            response.data = std::make_shared<std::string>(
-                reinterpret_cast<const char*>(AAsset_getBuffer(asset)), AAsset_getLength64(asset));
-            AAsset_close(asset);
-        } else {
-            response.error = std::make_unique<Response::Error>(Response::Error::Reason::NotFound,
-                                                               "Could not read asset");
-        }
-
-        req.invoke(&FileSourceRequest::setResponse, response);
-    }
-
-private:
-    AAssetManager* assetManager;
-};
-
-AssetManagerFileSource::AssetManagerFileSource(jni::JNIEnv& env,
-                                               const jni::Object<android::AssetManager>& assetManager_)
-    : assetManager(jni::NewGlobal(env, assetManager_)),
-      impl(std::make_unique<util::Thread<Impl>>(
-          util::makeThreadPrioritySetter(platform::EXPERIMENTAL_THREAD_PRIORITY_FILE),
-          "AssetManagerFileSource",
-          AAssetManager_fromJava(&env, jni::Unwrap(assetManager.get())))) {}
-
-AssetManagerFileSource::~AssetManagerFileSource() = default;
-
-std::unique_ptr<AsyncRequest> AssetManagerFileSource::request(const Resource& resource, Callback callback) {
-    auto req = std::make_unique<FileSourceRequest>(std::move(callback));
-
-    impl->actor().invoke(&Impl::request, resource.url, req->actor());
-
-    return std::move(req);
-}
-
-bool AssetManagerFileSource::canRequest(const Resource& resource) const {
-    return 0 == resource.url.rfind(mbgl::util::ASSET_PROTOCOL, 0);
-}
-
-} // namespace mbgl
diff --git a/platform/android/src/asset_manager_file_source.hpp b/platform/android/src/asset_manager_file_source.hpp
deleted file mode 100644
index bcbc6f1e9d..0000000000
--- a/platform/android/src/asset_manager_file_source.hpp
+++ /dev/null
@@ -1,30 +0,0 @@
-#pragma once
-
-#include <mbgl/storage/file_source.hpp>
-
-#include "asset_manager.hpp"
-
-#include <jni/jni.hpp>
-
-namespace mbgl {
-
-namespace util {
-template <typename T> class Thread;
-} // namespace util
-
-class AssetManagerFileSource : public FileSource {
-public:
-    AssetManagerFileSource(jni::JNIEnv&, const jni::Object<android::AssetManager>&);
-    ~AssetManagerFileSource() override;
-
-    std::unique_ptr<AsyncRequest> request(const Resource&, Callback) override;
-    bool canRequest(const Resource&) const override;
-
-private:
-    class Impl;
-
-    jni::Global<jni::Object<android::AssetManager>> assetManager;
-    std::unique_ptr<util::Thread<Impl>> impl;
-};
-
-} // namespace mbgl
diff --git a/platform/android/src/connectivity_listener.cpp b/platform/android/src/connectivity_listener.cpp
deleted file mode 100644
index 9c13f1f749..0000000000
--- a/platform/android/src/connectivity_listener.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
-#include "connectivity_listener.hpp"
-
-#include <mbgl/storage/network_status.hpp>
-#include <mbgl/util/logging.hpp>
-
-#include <jni/jni.hpp>
-
-namespace mbgl {
-namespace android {
-
-    /**
-     * Invoked when the construction is initiated from the jvm
-     */
-    ConnectivityListener::ConnectivityListener(jni::JNIEnv&) {}
-
-    ConnectivityListener::~ConnectivityListener() {}
-
-    void ConnectivityListener::onConnectivityStateChanged(jni::JNIEnv&, jni::jboolean connected) {
-        NetworkStatus::Set(connected ? NetworkStatus::Status::Online : NetworkStatus::Status::Offline);
-    }
-
-    void ConnectivityListener::registerNative(jni::JNIEnv& env) {
-        // Lookup the class
-        static auto& javaClass = jni::Class<ConnectivityListener>::Singleton(env);
-
-        #define METHOD(MethodPtr, name) jni::MakeNativePeerMethod<decltype(MethodPtr), (MethodPtr)>(name)
-
-        // Register the peer
-        jni::RegisterNativePeer<ConnectivityListener>(
-            env,
-            javaClass,
-            "nativePtr",
-            std::make_unique<ConnectivityListener, JNIEnv&>,
-            "initialize",
-            "finalize",
-            METHOD(&ConnectivityListener::onConnectivityStateChanged, "nativeOnConnectivityStateChanged")
-        );
-    }
-
-} // namespace android
-} // namespace mbgl
diff --git a/platform/android/src/connectivity_listener.hpp b/platform/android/src/connectivity_listener.hpp
deleted file mode 100644
index a09507c0f7..0000000000
--- a/platform/android/src/connectivity_listener.hpp
+++ /dev/null
@@ -1,29 +0,0 @@
-#pragma once
-
-#include <mbgl/util/noncopyable.hpp>
-
-#include <jni/jni.hpp>
-
-namespace mbgl {
-namespace android {
-
-class ConnectivityListener : private mbgl::util::noncopyable {
-public:
-
-    static constexpr auto Name() { return "com/mapbox/mapboxsdk/net/NativeConnectivityListener"; };
-
-    static void registerNative(jni::JNIEnv&);
-
-    /*
-     * Called when a Java object was created from the jvm side
-     */
-    ConnectivityListener(jni::JNIEnv&);
-
-    ~ConnectivityListener();
-
-    void onConnectivityStateChanged(jni::JNIEnv&, jni::jboolean);
-
-};
-
-} // namespace android
-} // namespace mbgl
diff --git a/platform/android/src/conversion/collection.cpp b/platform/android/src/conversion/collection.cpp
deleted file mode 100644
index 954a161baf..0000000000
--- a/platform/android/src/conversion/collection.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-#include "collection.hpp"
-#include "constant.hpp"
-
-namespace mbgl {
-namespace android {
-namespace conversion {
-
-std::vector<std::string> toVector(JNIEnv& env, const jni::Array<jni::String>& array) {
-    std::size_t len = array.Length(env);
-    std::vector<std::string> vector;
-    vector.reserve(len);
-
-    for (std::size_t i = 0; i < len; i++) {
-        vector.push_back(jni::Make<std::string>(env, array.Get(env, i)));
-    }
-
-    return vector;
-}
-
-jni::Local<jni::Array<jni::String>> toArray(JNIEnv& env, const std::vector<std::string>& vector) {
-    auto result = jni::Array<jni::String>::New(env, vector.size());
-
-    for (std::size_t i = 0; i < vector.size(); i++) {
-        result.Set(env, i, jni::Make<jni::String>(env, vector.at(i)));
-    }
-
-    return result;
-}
-
-}
-}
-}
diff --git a/platform/android/src/conversion/collection.hpp b/platform/android/src/conversion/collection.hpp
deleted file mode 100644
index 322ebb62e0..0000000000
--- a/platform/android/src/conversion/collection.hpp
+++ /dev/null
@@ -1,18 +0,0 @@
-#pragma once
-
-#include "conversion.hpp"
-
-#include <jni/jni.hpp>
-
-#include <vector>
-
-namespace mbgl {
-namespace android {
-namespace conversion {
-
-std::vector<std::string> toVector(JNIEnv& env, const jni::Array<jni::String>& array);
-jni::Local<jni::Array<jni::String>> toArray(JNIEnv& env, const std::vector<std::string>&);
-
-}
-}
-}
diff --git a/platform/android/src/conversion/color.cpp b/platform/android/src/conversion/color.cpp
deleted file mode 100644
index ce85943e61..0000000000
--- a/platform/android/src/conversion/color.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-#include "color.hpp"
-
-namespace mbgl {
-namespace android {
-namespace conversion {
-
-Result<mbgl::Color> Converter<mbgl::Color, int>::operator()(jni::JNIEnv&, const int& color) const {
-    float r = (color >> 16) & 0xFF;
-    float g = (color >> 8) & 0xFF;
-    float b = (color) & 0xFF;
-    float a = (color >> 24) & 0xFF;
-    return { mbgl::Color( r / 255.0f, g / 255.0f, b / 255.0f, a / 255.0f ) };
-}
-
-} // namespace conversion
-} // namespace style
-} // namespace mbgl
diff --git a/platform/android/src/conversion/color.hpp b/platform/android/src/conversion/color.hpp
deleted file mode 100644
index 2b4144b933..0000000000
--- a/platform/android/src/conversion/color.hpp
+++ /dev/null
@@ -1,18 +0,0 @@
-#pragma once
-
-#include "conversion.hpp"
-
-#include <mbgl/util/color.hpp>
-
-namespace mbgl {
-namespace android {
-namespace conversion {
-
-template <>
-struct Converter<mbgl::Color, int> {
-    Result<mbgl::Color> operator()(jni::JNIEnv&, const int& color) const;
-};
-
-} // namespace conversion
-} // namespace style
-} // namespace mbgl
diff --git a/platform/android/src/conversion/constant.cpp b/platform/android/src/conversion/constant.cpp
deleted file mode 100644
index 46a91026df..0000000000
--- a/platform/android/src/conversion/constant.cpp
+++ /dev/null
@@ -1,62 +0,0 @@
-#include "constant.hpp"
-#include "collection.hpp"
-#include "../style/formatted.hpp"
-
-#include <mbgl/util/string.hpp>
-
-namespace mbgl {
-namespace android {
-namespace conversion {
-
-Result<jni::Local<jni::Object<>>> Converter<jni::Local<jni::Object<>>, bool>::operator()(jni::JNIEnv& env, const bool& value) const {
-    return jni::Box(env, value ? jni::jni_true : jni::jni_false);
-}
-
-Result<jni::Local<jni::Object<>>> Converter<jni::Local<jni::Object<>>, float>::operator()(jni::JNIEnv& env, const float& value) const {
-    return jni::Box(env, value);
-}
-
-Result<jni::Local<jni::Object<>>> Converter<jni::Local<jni::Object<>>, double>::operator()(jni::JNIEnv& env, const double& value) const {
-    return jni::Box(env, value);
-}
-
-Result<jni::Local<jni::Object<>>> Converter<jni::Local<jni::Object<>>, std::string>::operator()(jni::JNIEnv& env, const std::string& value) const {
-    return jni::Make<jni::String>(env, value);
-}
-
-Result<jni::Local<jni::Object<>>> Converter<jni::Local<jni::Object<>>, Color>::operator()(jni::JNIEnv& env, const Color& value) const {
-    return jni::Make<jni::String>(env, value.stringify());
-}
-
-Result<jni::Local<jni::Object<>>> Converter<jni::Local<jni::Object<>>, style::expression::Formatted>::operator()(jni::JNIEnv& env, const style::expression::Formatted& value) const {
-    return Formatted::New(env, value);
-}
-
-Result<jni::Local<jni::Object<>>> Converter<jni::Local<jni::Object<>>, std::vector<std::string>>::operator()(jni::JNIEnv& env, const std::vector<std::string>& value) const {
-    auto result = jni::Array<jni::String>::New(env, value.size());
-
-    for (std::size_t i = 0; i < value.size(); i++) {
-        result.Set(env, i, jni::Make<jni::String>(env, value.at(i)));
-    }
-
-    return result;
-}
-
-Result<jni::Local<jni::Object<>>> Converter<jni::Local<jni::Object<>>, std::vector<float>>::operator()(jni::JNIEnv& env, const std::vector<float>& value) const {
-    auto result = jni::Array<jni::Float>::New(env, value.size());
-
-    for (std::size_t i = 0; i < value.size(); i++) {
-        result.Set(env, i, jni::Box(env, value.at(i)));
-    }
-
-    return result;
-}
-
-Result<jni::Local<jni::Object<>>> Converter<jni::Local<jni::Object<>>, style::expression::Image>::operator()(
-    jni::JNIEnv& env, const style::expression::Image& value) const {
-    return jni::Make<jni::String>(env, value.id());
-}
-
-} // namespace conversion
-} // namespace style
-} // namespace mbgl
diff --git a/platform/android/src/conversion/constant.hpp b/platform/android/src/conversion/constant.hpp
deleted file mode 100644
index a9239fe845..0000000000
--- a/platform/android/src/conversion/constant.hpp
+++ /dev/null
@@ -1,110 +0,0 @@
-#pragma once
-
-#include "conversion.hpp"
-
-#include <mbgl/util/color.hpp>
-#include <mbgl/util/enum.hpp>
-
-#include <mbgl/style/expression/formatted.hpp>
-#include <mbgl/style/expression/image.hpp>
-
-#include <jni/jni.hpp>
-
-#include <string>
-#include <array>
-#include <vector>
-
-namespace mbgl {
-namespace android {
-namespace conversion {
-
-template <>
-struct Converter<jni::Local<jni::Object<>>, bool> {
-    Result<jni::Local<jni::Object<>>> operator()(jni::JNIEnv& env, const bool& value) const;
-};
-
-template <>
-struct Converter<jni::Local<jni::Object<>>, float> {
-    Result<jni::Local<jni::Object<>>> operator()(jni::JNIEnv& env, const float& value) const;
-};
-
-template <>
-struct Converter<jni::Local<jni::Object<>>, double> {
-    Result<jni::Local<jni::Object<>>> operator()(jni::JNIEnv& env, const double& value) const;
-};
-
-/**
- * All integrals. java is limited to 64 bit signed, so...
- * TODO: use BigDecimal for > 64 / unsigned?
- */
-template<typename T>
-struct Converter<jni::Local<jni::Object<>>, T, typename std::enable_if<std::is_integral<T>::value>::type> {
-    Result<jni::Local<jni::Object<>>> operator()(jni::JNIEnv& env, const T& value) const {
-        return jni::Box(env, jni::jlong(value));
-    }
-};
-
-// TODO: convert integral types to primitive jni types
-
-template <>
-struct Converter<jni::Local<jni::Object<>>, std::string> {
-    Result<jni::Local<jni::Object<>>> operator()(jni::JNIEnv& env, const std::string& value) const;
-};
-
-template <>
-struct Converter<jni::Local<jni::Object<>>, Color> {
-    Result<jni::Local<jni::Object<>>> operator()(jni::JNIEnv& env, const Color& value) const;
-};
-
-template <>
-struct Converter<jni::Local<jni::Object<>>, style::expression::Formatted> {
-    Result<jni::Local<jni::Object<>>> operator()(jni::JNIEnv& env, const style::expression::Formatted& value) const;
-};
-
-template <std::size_t N>
-struct Converter<jni::Local<jni::Object<>>, std::array<float, N>> {
-    Result<jni::Local<jni::Object<>>> operator()(jni::JNIEnv& env, const std::array<float, N>& value) const {
-        std::vector<float> v;
-        for (const float& id : value) {
-            v.push_back(id);
-        }
-        return convert<jni::Local<jni::Object<>>, std::vector<float>>(env, v);
-    }
-};
-
-template <>
-struct Converter<jni::Local<jni::Object<>>, std::vector<std::string>> {
-    Result<jni::Local<jni::Object<>>> operator()(jni::JNIEnv& env, const std::vector<std::string>& value) const;
-};
-
-template <>
-struct Converter<jni::Local<jni::Object<>>, std::vector<float>> {
-    Result<jni::Local<jni::Object<>>> operator()(jni::JNIEnv& env, const std::vector<float>& value) const;
-};
-
-template <class T>
-struct Converter<jni::Local<jni::Object<>>, T, typename std::enable_if_t<std::is_enum<T>::value>> {
-    Result<jni::Local<jni::Object<>>> operator()(jni::JNIEnv& env, const T& value) const {
-        return convert<jni::Local<jni::Object<>>, std::string>(env, Enum<T>::toString(value));
-    }
-};
-
-template <class T>
-struct Converter<jni::Local<jni::Object<>>, std::vector<T>, typename std::enable_if_t<std::is_enum<T>::value>> {
-    Result<jni::Local<jni::Object<>>> operator()(jni::JNIEnv& env, const std::vector<T>& value) const {
-        auto result = jni::Array<jni::String>::New(env, value.size());
-        for (std::size_t i = 0; i < value.size(); ++i) {
-            result.Set(env, i, jni::Make<jni::String>(env, Enum<T>::toString(value.at(i))));
-        }
-        return result;
-    }
-};
-
-template <>
-struct Converter<jni::Local<jni::Object<>>, style::expression::Image> {
-    Result<jni::Local<jni::Object<>>> operator()(jni::JNIEnv& env, const style::expression::Image& value) const;
-};
-
-} // namespace conversion
-} // namespace android
-} // namespace mbgl
diff --git a/platform/android/src/conversion/conversion.hpp b/platform/android/src/conversion/conversion.hpp
deleted file mode 100644
index d1766f9755..0000000000
--- a/platform/android/src/conversion/conversion.hpp
+++ /dev/null
@@ -1,50 +0,0 @@
-#pragma once
-
-#include <mbgl/util/variant.hpp>
-
-#include <jni/jni.hpp>
-
-#include <string>
-
-namespace mbgl {
-namespace android {
-namespace conversion {
-
-struct Error { std::string message; };
-
-template <class T>
-class Result : private variant<T, Error> {
-public:
-    using variant<T, Error>::variant;
-
-    explicit operator bool() const {
-        return this->template is<T>();
-    }
-
-    T& operator*() {
-        assert(this->template is<T>());
-        return this->template get<T>();
-    }
-
-    const T& operator*() const {
-        assert(this->template is<T>());
-        return this->template get<T>();
-    }
-
-    const Error& error() const {
-        assert(this->template is<Error>());
-        return this->template get<Error>();
-    }
-};
-
-template <class T, class V, class Enable = void>
-struct Converter;
-
-template <class T, typename V, class...Args>
-Result<T> convert(jni::JNIEnv& env, const V& value, Args&&...args) {
-    return Converter<T, V>()(env, value, std::forward<Args>(args)...);
-}
-
-} // namespace conversion
-} // namespace android
-} // namespace mbgl
diff --git a/platform/android/src/file_source.cpp b/platform/android/src/file_source.cpp
deleted file mode 100644
index f95066546a..0000000000
--- a/platform/android/src/file_source.cpp
+++ /dev/null
@@ -1,252 +0,0 @@
-#include "file_source.hpp"
-
-#include "attach_env.hpp"
-#include "mapbox.hpp"
-
-#include <mbgl/actor/actor.hpp>
-#include <mbgl/actor/scheduler.hpp>
-#include <mbgl/storage/file_source_manager.hpp>
-#include <mbgl/storage/resource_options.hpp>
-#include <mbgl/storage/resource_transform.hpp>
-#include <mbgl/util/logging.hpp>
-
-#include <mbgl/storage/sqlite3.hpp>
-
-#include "asset_manager_file_source.hpp"
-
-namespace mbgl {
-namespace android {
-
-// FileSource //
-
-FileSource::FileSource(jni::JNIEnv& _env, const jni::String& accessToken, const jni::String& _cachePath) {
-    std::string path = jni::Make<std::string>(_env, _cachePath);
-    mapbox::sqlite::setTempPath(path);
-
-    mbgl::FileSourceManager::get()->registerFileSourceFactory(
-        mbgl::FileSourceType::Asset, [](const mbgl::ResourceOptions&) {
-            auto env{android::AttachEnv()};
-            std::unique_ptr<mbgl::FileSource> assetFileSource;
-            if (android::Mapbox::hasInstance(*env)) {
-                auto assetManager = android::Mapbox::getAssetManager(*env);
-                assetFileSource = std::make_unique<AssetManagerFileSource>(*env, assetManager);
-            }
-            return assetFileSource;
-        });
-
-    resourceOptions.withAccessToken(accessToken ? jni::Make<std::string>(_env, accessToken) : "")
-        .withCachePath(path + DATABASE_FILE);
-
-    // Create a core file sources
-    // TODO: Split Android FileSource API to smaller interfaces
-    resourceLoader =
-        mbgl::FileSourceManager::get()->getFileSource(mbgl::FileSourceType::ResourceLoader, resourceOptions);
-    databaseSource = std::static_pointer_cast<mbgl::DatabaseFileSource>(std::shared_ptr<mbgl::FileSource>(
-        mbgl::FileSourceManager::get()->getFileSource(mbgl::FileSourceType::Database, resourceOptions)));
-    onlineSource = mbgl::FileSourceManager::get()->getFileSource(mbgl::FileSourceType::Network, resourceOptions);
-}
-
-FileSource::~FileSource() {
-}
-
-jni::Local<jni::String> FileSource::getAccessToken(jni::JNIEnv& env) {
-    if (auto* token = onlineSource->getProperty(mbgl::ACCESS_TOKEN_KEY).getString()) {
-        return jni::Make<jni::String>(env, *token);
-    }
-
-    ThrowNew(env, jni::FindClass(env, "java/lang/IllegalStateException"), "Online functionality is disabled.");
-    return jni::Make<jni::String>(env, "");
-}
-
-void FileSource::setAccessToken(jni::JNIEnv& env, const jni::String& token) {
-    if (onlineSource) {
-        onlineSource->setProperty(mbgl::ACCESS_TOKEN_KEY, token ? jni::Make<std::string>(env, token) : "");
-    } else {
-        ThrowNew(env, jni::FindClass(env, "java/lang/IllegalStateException"), "Online functionality is disabled.");
-    }
-}
-
-void FileSource::setAPIBaseUrl(jni::JNIEnv& env, const jni::String& url) {
-    if (onlineSource) {
-        onlineSource->setProperty(mbgl::API_BASE_URL_KEY, jni::Make<std::string>(env, url));
-    } else {
-        ThrowNew(env, jni::FindClass(env, "java/lang/IllegalStateException"), "Online functionality is disabled.");
-    }
-}
-
-void FileSource::setResourceTransform(jni::JNIEnv& env, const jni::Object<FileSource::ResourceTransformCallback>& transformCallback) {
-    // Core could be built without support for network resource provider.
-    if (!onlineSource) {
-        ThrowNew(env, jni::FindClass(env, "java/lang/IllegalStateException"), "Online functionality is disabled.");
-        return;
-    }
-
-    if (transformCallback) {
-        auto global = jni::NewGlobal<jni::EnvAttachingDeleter>(env, transformCallback);
-        resourceTransform = std::make_unique<Actor<ResourceTransform::TransformCallback>>(
-            *Scheduler::GetCurrent(),
-            // Capture the ResourceTransformCallback object as a managed global into
-            // the lambda. It is released automatically when we're setting a new ResourceTransform in
-            // a subsequent call.
-            // Note: we're converting it to shared_ptr because this lambda is converted to a std::function,
-            // which requires copyability of its captured variables.
-            [callback = std::make_shared<decltype(global)>(std::move(global))](
-                mbgl::Resource::Kind kind, const std::string& url_, ResourceTransform::FinishedCallback cb) {
-                android::UniqueEnv _env = android::AttachEnv();
-                cb(FileSource::ResourceTransformCallback::onURL(*_env, *callback, int(kind), url_));
-            });
-        onlineSource->setResourceTransform(
-            {[actorRef = resourceTransform->self()](
-                 Resource::Kind kind, const std::string& url, ResourceTransform::FinishedCallback cb) {
-                actorRef.invoke(&ResourceTransform::TransformCallback::operator(), kind, url, std::move(cb));
-            }});
-    } else {
-        // Reset the callback
-        resourceTransform.reset();
-        onlineSource->setResourceTransform({});
-    }
-}
-
-void FileSource::setResourceCachePath(jni::JNIEnv& env,
-                                      const jni::String& path,
-                                      const jni::Object<FileSource::ResourcesCachePathChangeCallback>& _callback) {
-    if (!databaseSource) {
-        ThrowNew(env, jni::FindClass(env, "java/lang/IllegalStateException"), "Offline functionality is disabled.");
-        return;
-    }
-
-    if (pathChangeCallback) {
-        FileSource::ResourcesCachePathChangeCallback::onError(env, _callback, jni::Make<jni::String>(env, "Another resources cache path change is in progress"));
-        return;
-    }
-
-    std::string newPath = jni::Make<std::string>(env, path);
-    mapbox::sqlite::setTempPath(newPath);
-
-    auto global = jni::NewGlobal<jni::EnvAttachingDeleter>(env, _callback);
-    pathChangeCallback = Scheduler::GetCurrent()->bindOnce(
-        [this, callback = std::make_shared<decltype(global)>(std::move(global)), newPath] {
-            android::UniqueEnv _env = android::AttachEnv();
-            FileSource::ResourcesCachePathChangeCallback::onSuccess(
-                *_env, *callback, jni::Make<jni::String>(*_env, newPath));
-            pathChangeCallback = {};
-        });
-
-    databaseSource->setDatabasePath(newPath + DATABASE_FILE, pathChangeCallback);
-}
-
-void FileSource::resume(jni::JNIEnv&) {
-    if (!resourceLoader) {
-        return;
-    }
-
-    if (!activationCounter) {
-        activationCounter = optional<int>(1) ;
-        return;
-    }
-
-    activationCounter.value()++;
-    if (activationCounter == 1) {
-        resourceLoader->resume();
-    }
-}
-
-void FileSource::pause(jni::JNIEnv&) {
-    if (!resourceLoader) {
-        return;
-    }
-
-    if (activationCounter) {
-        activationCounter.value()--;
-        if (activationCounter == 0) {
-            resourceLoader->pause();
-        }
-    }
-}
-
-jni::jboolean FileSource::isResumed(jni::JNIEnv&) {
-    if (activationCounter) {
-       return  (jboolean) (activationCounter > 0);
-    }
-    return (jboolean) false;
-}
-
-FileSource* FileSource::getNativePeer(jni::JNIEnv& env, const jni::Object<FileSource>& jFileSource) {
-    static auto& javaClass = jni::Class<FileSource>::Singleton(env);
-    static auto field = javaClass.GetField<jlong>(env, "nativePtr");
-    return reinterpret_cast<FileSource *>(jFileSource.Get(env, field));
-}
-
-mbgl::ResourceOptions FileSource::getSharedResourceOptions(jni::JNIEnv& env,
-                                                           const jni::Object<FileSource>& jFileSource) {
-    FileSource* fileSource = FileSource::getNativePeer(env, jFileSource);
-    // Core could be compiled without support for any sources.
-    if (fileSource) {
-        return fileSource->resourceOptions.clone();
-    }
-
-    return {};
-}
-
-// FileSource::ResourcesCachePathChangeCallback //
-
-void FileSource::ResourcesCachePathChangeCallback::onSuccess(jni::JNIEnv& env,
-                                                             const jni::Object<FileSource::ResourcesCachePathChangeCallback>& callback,
-                                                             const jni::String& path) {
-    static auto& javaClass = jni::Class<FileSource::ResourcesCachePathChangeCallback>::Singleton(env);
-    static auto method = javaClass.GetMethod<void (jni::String)>(env, "onSuccess");
-
-    callback.Call(env, method, path);
-}
-
-void FileSource::ResourcesCachePathChangeCallback::onError(jni::JNIEnv& env,
-                                                             const jni::Object<FileSource::ResourcesCachePathChangeCallback>& callback,
-                                                             const jni::String& message) {
-    static auto& javaClass = jni::Class<FileSource::ResourcesCachePathChangeCallback>::Singleton(env);
-    static auto method = javaClass.GetMethod<void (jni::String)>(env, "onError");
-
-    callback.Call(env, method, message);
-}
-
-void FileSource::registerNative(jni::JNIEnv& env) {
-    // Ensure the classes are cached. If they're requested for the
-    // first time on a background thread, Android's class loader heuristics will fail.
-    // https://developer.android.com/training/articles/perf-jni#faq_FindClass
-    jni::Class<ResourceTransformCallback>::Singleton(env);
-    jni::Class<ResourcesCachePathChangeCallback>::Singleton(env);
-
-    static auto& javaClass = jni::Class<FileSource>::Singleton(env);
-
-    #define METHOD(MethodPtr, name) jni::MakeNativePeerMethod<decltype(MethodPtr), (MethodPtr)>(name)
-
-    // Register the peer
-    jni::RegisterNativePeer<FileSource>(env,
-                                        javaClass,
-                                        "nativePtr",
-                                        jni::MakePeer<FileSource, const jni::String&, const jni::String&>,
-                                        "initialize",
-                                        "finalize",
-                                        METHOD(&FileSource::getAccessToken, "getAccessToken"),
-                                        METHOD(&FileSource::setAccessToken, "setAccessToken"),
-                                        METHOD(&FileSource::setAPIBaseUrl, "setApiBaseUrl"),
-                                        METHOD(&FileSource::setResourceTransform, "setResourceTransform"),
-                                        METHOD(&FileSource::setResourceCachePath, "setResourceCachePath"),
-                                        METHOD(&FileSource::resume, "activate"),
-                                        METHOD(&FileSource::pause, "deactivate"),
-                                        METHOD(&FileSource::isResumed, "isActivated"));
-}
-
-
-// FileSource::ResourceTransformCallback //
-
-std::string FileSource::ResourceTransformCallback::onURL(jni::JNIEnv& env, const jni::Object<FileSource::ResourceTransformCallback>& callback, int kind, std::string url_) {
-    static auto& javaClass = jni::Class<FileSource::ResourceTransformCallback>::Singleton(env);
-    static auto method = javaClass.GetMethod<jni::String (jni::jint, jni::String)>(env, "onURL");
-
-    return jni::Make<std::string>(env,
-        callback.Call(env, method, kind,
-            jni::Make<jni::String>(env, url_)));
-}
-
-} // namespace android
-} // namespace mbgl
diff --git a/platform/android/src/file_source.hpp b/platform/android/src/file_source.hpp
deleted file mode 100644
index 3bf0fed2eb..0000000000
--- a/platform/android/src/file_source.hpp
+++ /dev/null
@@ -1,83 +0,0 @@
-#pragma once
-
-#include <mbgl/storage/database_file_source.hpp>
-#include <mbgl/storage/online_file_source.hpp>
-#include <mbgl/storage/resource_options.hpp>
-#include <mbgl/storage/resource_transform.hpp>
-
-#include "asset_manager.hpp"
-
-#include <jni/jni.hpp>
-
-namespace mbgl {
-
-template <typename T> class Actor;
-
-namespace android {
-
-/**
- * Peer class for the Android FileSource holder. Ensures that a single core FileSource
- * of a ResourceLoader type is used.
- */
-class FileSource {
-public:
-
-    static constexpr auto Name() { return "com/mapbox/mapboxsdk/storage/FileSource"; };
-
-    struct ResourceTransformCallback {
-        static constexpr auto Name() { return "com/mapbox/mapboxsdk/storage/FileSource$ResourceTransformCallback"; }
-
-        static std::string onURL(jni::JNIEnv&, const jni::Object<FileSource::ResourceTransformCallback>&, int, std::string);
-    };
-
-    struct ResourcesCachePathChangeCallback {
-        static constexpr auto Name() { return "com/mapbox/mapboxsdk/storage/FileSource$ResourcesCachePathChangeCallback";}
-
-        static void onSuccess(jni::JNIEnv&,
-                              const jni::Object<FileSource::ResourcesCachePathChangeCallback>&,
-                              const jni::String&);
-
-        static void onError(jni::JNIEnv&,
-                              const jni::Object<FileSource::ResourcesCachePathChangeCallback>&,
-                              const jni::String&);
-    };
-
-    FileSource(jni::JNIEnv&, const jni::String&, const jni::String&);
-
-    ~FileSource();
-
-    jni::Local<jni::String> getAccessToken(jni::JNIEnv&);
-
-    void setAccessToken(jni::JNIEnv&, const jni::String&);
-
-    void setAPIBaseUrl(jni::JNIEnv&, const jni::String&);
-
-    void setResourceTransform(jni::JNIEnv&, const jni::Object<FileSource::ResourceTransformCallback>&);
-
-    void setResourceCachePath(jni::JNIEnv&, const jni::String&, const jni::Object<FileSource::ResourcesCachePathChangeCallback>&);
-
-    void resume(jni::JNIEnv&);
-
-    void pause(jni::JNIEnv&);
-
-    jni::jboolean isResumed(jni::JNIEnv&);
-
-    static FileSource* getNativePeer(jni::JNIEnv&, const jni::Object<FileSource>&);
-
-    static mbgl::ResourceOptions getSharedResourceOptions(jni::JNIEnv&, const jni::Object<FileSource>&);
-
-    static void registerNative(jni::JNIEnv&);
-
-private:
-    const std::string DATABASE_FILE = "/mbgl-offline.db";
-    optional<int> activationCounter;
-    mbgl::ResourceOptions resourceOptions;
-    std::unique_ptr<Actor<ResourceTransform::TransformCallback>> resourceTransform;
-    std::function<void()> pathChangeCallback;
-    std::shared_ptr<mbgl::DatabaseFileSource> databaseSource;
-    std::shared_ptr<mbgl::FileSource> onlineSource;
-    std::shared_ptr<mbgl::FileSource> resourceLoader;
-};
-
-} // namespace android
-} // namespace mbgl
diff --git a/platform/android/src/geojson/feature.cpp b/platform/android/src/geojson/feature.cpp
deleted file mode 100644
index afbf1ee11e..0000000000
--- a/platform/android/src/geojson/feature.cpp
+++ /dev/null
@@ -1,88 +0,0 @@
-#include "feature.hpp"
-#include "geometry.hpp"
-#include "../gson/json_object.hpp"
-
-#include <mbgl/util/string.hpp>
-
-namespace mbgl {
-namespace android {
-namespace geojson {
-
-using namespace gson;
-
-mbgl::GeoJSONFeature Feature::convert(jni::JNIEnv& env, const jni::Object<Feature>& jFeature) {
-    static auto& javaClass = jni::Class<Feature>::Singleton(env);
-    static auto id = javaClass.GetMethod<jni::String ()>(env, "id");
-    static auto geometry = javaClass.GetMethod<jni::Object<Geometry> ()>(env, "geometry");
-    static auto properties = javaClass.GetMethod<jni::Object<gson::JsonObject> ()>(env, "properties");
-
-    auto jId = jFeature.Call(env, id);
-
-    using mbid = mapbox::feature::identifier;
-
-    return mbgl::GeoJSONFeature{Geometry::convert(env, jFeature.Call(env, geometry)),
-                                JsonObject::convert(env, jFeature.Call(env, properties)),
-                                jId ? mbid{jni::Make<std::string>(env, jId)} : mbid{mapbox::feature::null_value}};
-}
-
-/**
- * Turn feature identifier into std::string
- */
-class FeatureIdVisitor {
-public:
-    template<class T>
-    std::string operator()(const T& i) const {
-        return util::toString(i);
-    }
-
-    std::string operator()(const std::string& i) const {
-        return i;
-    }
-
-    std::string operator()(const std::nullptr_t&) const {
-        return {};
-    }
-
-    std::string operator()(const mapbox::feature::null_value_t&) const {
-        return {};
-    }
-};
-
-jni::Local<jni::Object<Feature>> convertFeature(jni::JNIEnv& env, const mbgl::GeoJSONFeature& value) {
-    static auto& javaClass = jni::Class<Feature>::Singleton(env);
-    static auto method = javaClass.GetStaticMethod<jni::Object<Feature> (jni::Object<Geometry>, jni::Object<JsonObject>, jni::String)>(env, "fromGeometry");
-
-    return javaClass.Call(env, method,
-        Geometry::New(env, value.geometry),
-        JsonObject::New(env, value.properties),
-        jni::Make<jni::String>(env, value.id.is<mbgl::NullValue>() ? std::string {} : value.id.match(FeatureIdVisitor())));
-}
-
-jni::Local<jni::Array<jni::Object<Feature>>> Feature::convert(jni::JNIEnv& env, const std::vector<mbgl::Feature>& value) {
-    auto features = jni::Array<jni::Object<Feature>>::New(env, value.size());
-
-    for (size_t i = 0; i < value.size(); ++i) {
-        features.Set(env, i, convertFeature(env, static_cast<mbgl::GeoJSONFeature>(value.at(i))));
-    }
-
-    return features;
-}
-
-jni::Local<jni::Array<jni::Object<Feature>>> Feature::convert(jni::JNIEnv& env,
-                                                              const std::vector<mbgl::GeoJSONFeature>& value) {
-    auto features = jni::Array<jni::Object<Feature>>::New(env, value.size());
-
-    for (size_t i = 0; i < value.size(); ++i) {
-        features.Set(env, i, convertFeature(env, value.at(i)));
-    }
-
-    return features;
-}
-
-void Feature::registerNative(jni::JNIEnv& env) {
-    jni::Class<Feature>::Singleton(env);
-}
-
-} // namespace geojson
-} // namespace android
-} // namespace mbgl
diff --git a/platform/android/src/geojson/feature.hpp b/platform/android/src/geojson/feature.hpp
deleted file mode 100644
index aee45262e3..0000000000
--- a/platform/android/src/geojson/feature.hpp
+++ /dev/null
@@ -1,24 +0,0 @@
-#pragma once
-
-#include <mbgl/util/feature.hpp>
-
-#include <jni/jni.hpp>
-
-namespace mbgl {
-namespace android {
-namespace geojson {
-
-class Feature {
-public:
-    static constexpr auto Name() { return "com/mapbox/geojson/Feature"; };
-
-    static mbgl::GeoJSONFeature convert(jni::JNIEnv&, const jni::Object<Feature>&);
-    static jni::Local<jni::Array<jni::Object<Feature>>> convert(jni::JNIEnv&, const std::vector<mbgl::Feature>&);
-    static jni::Local<jni::Array<jni::Object<Feature>>> convert(jni::JNIEnv&, const std::vector<mbgl::GeoJSONFeature>&);
-
-    static void registerNative(jni::JNIEnv&);
-};
-
-} // namespace geojson
-} // namespace android
-} // namespace mbgl
\ No newline at end of file
diff --git a/platform/android/src/geojson/feature_collection.cpp b/platform/android/src/geojson/feature_collection.cpp
deleted file mode 100644
index f90d5226b7..0000000000
--- a/platform/android/src/geojson/feature_collection.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
-#include "feature_collection.hpp"
-
-#include "feature.hpp"
-
-namespace mbgl {
-namespace android {
-namespace geojson {
-
-mbgl::FeatureCollection FeatureCollection::convert(jni::JNIEnv& env, const jni::Object<FeatureCollection>& jCollection) {
-    auto collection = mbgl::FeatureCollection();
-
-    if (jCollection) {
-        auto jFeatureList = FeatureCollection::features(env, jCollection);
-        auto jFeatures = java::util::List::toArray<Feature>(env, jFeatureList);
-        auto size = size_t(jFeatures.Length(env));
-        collection.reserve(size);
-
-        for (size_t i = 0; i < size; i++) {
-            collection.push_back(Feature::convert(env, jFeatures.Get(env, i)));
-        }
-    }
-    return collection;
-}
-
-jni::Local<jni::Object<java::util::List>> FeatureCollection::features(jni::JNIEnv& env, const jni::Object<FeatureCollection>& jCollection) {
-    static auto& javaClass = jni::Class<FeatureCollection>::Singleton(env);
-    static auto method = javaClass.GetMethod<jni::Object<java::util::List> ()>(env, "features");
-    return jCollection.Call(env, method);
-}
-
-void FeatureCollection::registerNative(jni::JNIEnv& env) {
-    jni::Class<FeatureCollection>::Singleton(env);
-}
-
-} // namespace geojson
-} // namespace android
-} // namespace mbgl
\ No newline at end of file
diff --git a/platform/android/src/geojson/feature_collection.hpp b/platform/android/src/geojson/feature_collection.hpp
deleted file mode 100644
index 66e92eacad..0000000000
--- a/platform/android/src/geojson/feature_collection.hpp
+++ /dev/null
@@ -1,26 +0,0 @@
-#pragma once
-
-#include "../java/util.hpp"
-
-#include <mbgl/util/geojson.hpp>
-
-#include <jni/jni.hpp>
-
-namespace mbgl {
-namespace android {
-namespace geojson {
-
-class FeatureCollection {
-public:
-    static constexpr auto Name() { return "com/mapbox/geojson/FeatureCollection"; };
-
-    static mbgl::FeatureCollection convert(jni::JNIEnv&, const jni::Object<FeatureCollection>&);
-
-    static jni::Local<jni::Object<java::util::List>> features(jni::JNIEnv&, const jni::Object<FeatureCollection>&);
-
-    static void registerNative(jni::JNIEnv&);
-};
-
-} // namespace geojson
-} // namespace android
-} // namespace mbgl
\ No newline at end of file
diff --git a/platform/android/src/geojson/geometry.cpp b/platform/android/src/geojson/geometry.cpp
deleted file mode 100644
index 0598b9fc59..0000000000
--- a/platform/android/src/geojson/geometry.cpp
+++ /dev/null
@@ -1,97 +0,0 @@
-#include "geometry.hpp"
-
-#include "point.hpp"
-#include "multi_point.hpp"
-#include "line_string.hpp"
-#include "multi_line_string.hpp"
-#include "polygon.hpp"
-#include "multi_polygon.hpp"
-#include "geometry_collection.hpp"
-
-#include <string>
-
-namespace mbgl {
-namespace android {
-namespace geojson {
-
-/**
- * Turn mapbox::geometry type into Java GeoJson Geometries
- */
-class GeometryEvaluator {
-public:
-
-    jni::JNIEnv& env;
-
-    jni::Local<jni::Object<Geometry>> operator()(const mbgl::EmptyGeometry &) const {
-        // FIXME: mapbox-java needs to have its own Empty type.
-        return GeometryCollection::New(env, {});
-    }
-
-    jni::Local<jni::Object<Geometry>> operator()(const mbgl::Point<double> &geometry) const {
-        return Point::New(env, geometry);
-    }
-
-    jni::Local<jni::Object<Geometry>> operator()(const mbgl::LineString<double> &geometry) const {
-        return LineString::New(env, geometry);
-    }
-
-    jni::Local<jni::Object<Geometry>>  operator()(const mbgl::MultiLineString<double> &geometry) const {
-        return MultiLineString::New(env, geometry);
-    }
-
-    jni::Local<jni::Object<Geometry>> operator()(const mbgl::MultiPoint<double> &geometry) const {
-        return MultiPoint::New(env, geometry);
-    }
-
-    jni::Local<jni::Object<Geometry>> operator()(const mbgl::Polygon<double> &geometry) const {
-        return Polygon::New(env, geometry);
-    }
-
-    jni::Local<jni::Object<Geometry>>  operator()(const mbgl::MultiPolygon<double> &geometry) const {
-        return MultiPolygon::New(env, geometry);
-    }
-
-    jni::Local<jni::Object<Geometry>>  operator()(const mapbox::geometry::geometry_collection<double> &geometry) const {
-        return GeometryCollection::New(env, geometry);
-    }
-};
-
-jni::Local<jni::Object<Geometry>> Geometry::New(jni::JNIEnv& env, mbgl::Geometry<double> geometry) {
-    GeometryEvaluator evaluator { env } ;
-    return mbgl::Geometry<double>::visit(geometry, evaluator);
-}
-
-mbgl::Geometry<double> Geometry::convert(jni::JNIEnv &env, const jni::Object<Geometry>& jGeometry) {
-    auto type = Geometry::getType(env, jGeometry);
-    if (type == Point::Type()) {
-        return { Point::convert(env, jni::Cast(env, jni::Class<Point>::Singleton(env), jGeometry)) };
-    } else if (type == MultiPoint::Type()) {
-        return { MultiPoint::convert(env, jni::Cast(env, jni::Class<MultiPoint>::Singleton(env), jGeometry)) };
-    } else if (type == LineString::Type()) {
-        return { LineString::convert(env, jni::Cast(env, jni::Class<LineString>::Singleton(env), jGeometry)) };
-    } else if (type == MultiLineString::Type()) {
-        return { MultiLineString::convert(env, jni::Cast(env, jni::Class<MultiLineString>::Singleton(env), jGeometry)) };
-    } else if (type == Polygon::Type()) {
-        return { Polygon::convert(env, jni::Cast(env, jni::Class<Polygon>::Singleton(env), jGeometry)) };
-    } else if (type == MultiPolygon::Type()) {
-        return { MultiPolygon::convert(env, jni::Cast(env, jni::Class<MultiPolygon>::Singleton(env), jGeometry)) };
-    } else if (type == GeometryCollection::Type()) {
-        return { GeometryCollection::convert(env, jni::Cast(env, jni::Class<GeometryCollection>::Singleton(env), jGeometry)) };
-    }
-
-    throw std::runtime_error(std::string {"Unsupported GeoJSON type: " } + type);
-}
-
-std::string Geometry::getType(jni::JNIEnv &env, const jni::Object<Geometry>& jGeometry) {
-    static auto& javaClass = jni::Class<Geometry>::Singleton(env);
-    static auto method = javaClass.GetMethod<jni::String ()>(env, "type");
-    return jni::Make<std::string>(env, jGeometry.Call(env, method));
-}
-
-void Geometry::registerNative(jni::JNIEnv &env) {
-    jni::Class<Geometry>::Singleton(env);
-}
-
-} // namespace geojson
-} // namespace android
-} // namespace mbgl
diff --git a/platform/android/src/geojson/geometry.hpp b/platform/android/src/geojson/geometry.hpp
deleted file mode 100644
index 4bf55c858b..0000000000
--- a/platform/android/src/geojson/geometry.hpp
+++ /dev/null
@@ -1,28 +0,0 @@
-#pragma once
-
-#include <mbgl/util/geometry.hpp>
-
-#include "../java/util.hpp"
-
-#include <jni/jni.hpp>
-
-namespace mbgl {
-namespace android {
-namespace geojson {
-
-class Geometry {
-public:
-    static constexpr auto Name() { return "com/mapbox/geojson/Geometry"; };
-
-    static jni::Local<jni::Object<Geometry>> New(jni::JNIEnv&, mbgl::Geometry<double>);
-
-    static mbgl::Geometry<double> convert(jni::JNIEnv&, const jni::Object<Geometry>&);
-
-    static std::string getType(jni::JNIEnv&, const jni::Object<Geometry>&);
-
-    static void registerNative(jni::JNIEnv&);
-};
-
-} // namespace geojson
-} // namespace android
-} // namespace mbgl
\ No newline at end of file
diff --git a/platform/android/src/geojson/geometry_collection.cpp b/platform/android/src/geojson/geometry_collection.cpp
deleted file mode 100644
index cca909126d..0000000000
--- a/platform/android/src/geojson/geometry_collection.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-#include "geometry_collection.hpp"
-#include "../java/util.hpp"
-
-namespace mbgl {
-namespace android {
-namespace geojson {
-
-jni::Local<jni::Object<GeometryCollection>> GeometryCollection::New(jni::JNIEnv& env, const mapbox::geometry::geometry_collection<double>& collection) {
-    // Create an array of geometries
-    auto jarray = jni::Array<jni::Object<Geometry>>::New(env, collection.size());
-
-    for (size_t i = 0; i < collection.size(); i++) {
-        jarray.Set(env, i, Geometry::New(env, collection.at(i)));
-    }
-
-    // create the GeometryCollection
-    static auto& javaClass = jni::Class<GeometryCollection>::Singleton(env);
-    static auto method = javaClass.GetStaticMethod<jni::Object<GeometryCollection> (jni::Object<java::util::List>)>(env, "fromGeometries");
-    return javaClass.Call(env, method, java::util::Arrays::asList(env, jarray));
-}
-
-mapbox::geometry::geometry_collection<double> GeometryCollection::convert(jni::JNIEnv &env, const jni::Object<GeometryCollection>& jCollection) {
-    // Get geometries
-    static auto& javaClass = jni::Class<GeometryCollection>::Singleton(env);
-    static auto getGeometries = javaClass.GetMethod<jni::Object<java::util::List> ()>(env, "geometries");
-
-    // Turn into array
-    auto jarray = java::util::List::toArray<Geometry>(env, jCollection.Call(env, getGeometries));
-
-    // Convert each geometry
-    mapbox::geometry::geometry_collection<double> collection{};
-
-    auto size = jarray.Length(env);
-    for (jni::jsize i = 0; i < size; i++) {
-        collection.push_back(Geometry::convert(env, jarray.Get(env, i)));
-    }
-
-    return collection;
-}
-
-void GeometryCollection::registerNative(jni::JNIEnv &env) {
-    jni::Class<GeometryCollection>::Singleton(env);
-}
-
-} // namespace geojson
-} // namespace android
-} // namespace mbgl
\ No newline at end of file
diff --git a/platform/android/src/geojson/geometry_collection.hpp b/platform/android/src/geojson/geometry_collection.hpp
deleted file mode 100644
index 9f02ac848d..0000000000
--- a/platform/android/src/geojson/geometry_collection.hpp
+++ /dev/null
@@ -1,26 +0,0 @@
-#pragma once
-
-#include "geometry.hpp"
-
-#include <jni/jni.hpp>
-
-namespace mbgl {
-namespace android {
-namespace geojson {
-
-class GeometryCollection {
-public:
-    using SuperTag = Geometry;
-    static constexpr auto Name() { return "com/mapbox/geojson/GeometryCollection"; };
-    static constexpr auto Type() { return "GeometryCollection"; };
-
-    static jni::Local<jni::Object<GeometryCollection>> New(jni::JNIEnv&, const mapbox::geometry::geometry_collection<double>&);
-
-    static mapbox::geometry::geometry_collection<double> convert(jni::JNIEnv&, const jni::Object<GeometryCollection>&);
-
-    static void registerNative(jni::JNIEnv&);
-};
-
-} // namespace geojson
-} // namespace android
-} // namespace mbgl
\ No newline at end of file
diff --git a/platform/android/src/geojson/line_string.cpp b/platform/android/src/geojson/line_string.cpp
deleted file mode 100644
index ae1345c958..0000000000
--- a/platform/android/src/geojson/line_string.cpp
+++ /dev/null
@@ -1,55 +0,0 @@
-#include "line_string.hpp"
-#include "point.hpp"
-#include "util.hpp"
-#include "../java/util.hpp"
-
-namespace mbgl {
-namespace android {
-namespace geojson {
-
-jni::Local<jni::Object<LineString>> LineString::New(jni::JNIEnv& env, const mbgl::LineString<double>& lineString) {
-    static auto& javaClass = jni::Class<LineString>::Singleton(env);
-    static auto method = javaClass.GetStaticMethod<jni::Object<LineString>(jni::Object<java::util::List>)>(env, "fromLngLats");
-
-    return javaClass.Call(env, method, asPointsList(env, lineString));
-}
-
-mapbox::geojson::line_string LineString::convert(jni::JNIEnv &env, const jni::Object<LineString>& jLineString) {
-    mapbox::geojson::line_string lineString;
-
-    if (jLineString) {
-        lineString = LineString::convert(env, LineString::coordinates(env, jLineString));
-    }
-
-    return lineString;
-}
-
-mapbox::geojson::line_string LineString::convert(jni::JNIEnv &env, const jni::Object<java::util::List/*<Point>*/>& jPointList) {
-    mapbox::geojson::line_string lineString;
-
-    if (jPointList) {
-        auto jPointArray = java::util::List::toArray<Point>(env, jPointList);
-        auto size = jPointArray.Length(env);
-        lineString.reserve(size);
-
-        for (std::size_t i = 0; i < size; i++) {
-            lineString.push_back(Point::convert(env, jPointArray.Get(env, i)));
-        }
-    }
-
-    return lineString;
-}
-
-jni::Local<jni::Object<java::util::List>> LineString::coordinates(jni::JNIEnv &env, const jni::Object<LineString>& jLineString) {
-    static auto& javaClass = jni::Class<LineString>::Singleton(env);
-    static auto method = javaClass.GetMethod<jni::Object<java::util::List> ()>(env, "coordinates");
-    return jLineString.Call(env, method);
-}
-
-void LineString::registerNative(jni::JNIEnv &env) {
-    jni::Class<LineString>::Singleton(env);
-}
-
-} // namespace geojson
-} // namespace android
-} // namespace mbgl
\ No newline at end of file
diff --git a/platform/android/src/geojson/line_string.hpp b/platform/android/src/geojson/line_string.hpp
deleted file mode 100644
index 906d809fa8..0000000000
--- a/platform/android/src/geojson/line_string.hpp
+++ /dev/null
@@ -1,36 +0,0 @@
-#pragma once
-
-#include <mbgl/util/geojson.hpp>
-#include <mbgl/util/geometry.hpp>
-#include <mbgl/util/noncopyable.hpp>
-
-#include "geometry.hpp"
-#include "../java/util.hpp"
-
-#include <jni/jni.hpp>
-
-namespace mbgl {
-namespace android {
-namespace geojson {
-
-
-class LineString {
-public:
-    using SuperTag = Geometry;
-    static constexpr auto Name() { return "com/mapbox/geojson/LineString"; };
-    static constexpr auto Type() { return "LineString"; };
-
-    static jni::Local<jni::Object<LineString>> New(jni::JNIEnv&, const mbgl::LineString<double>&);
-
-    static mapbox::geojson::line_string convert(jni::JNIEnv&, const jni::Object<LineString>&);
-
-    static mapbox::geojson::line_string convert(jni::JNIEnv&, const jni::Object<java::util::List/*<Point>*/>&);
-
-    static jni::Local<jni::Object<java::util::List>> coordinates(jni::JNIEnv&, const jni::Object<LineString>&);
-
-    static void registerNative(jni::JNIEnv&);
-};
-
-} // namespace geojson
-} // namespace android
-} // namespace mbgl
\ No newline at end of file
diff --git a/platform/android/src/geojson/multi_line_string.cpp b/platform/android/src/geojson/multi_line_string.cpp
deleted file mode 100644
index 1aaf53c01f..0000000000
--- a/platform/android/src/geojson/multi_line_string.cpp
+++ /dev/null
@@ -1,56 +0,0 @@
-#include "multi_line_string.hpp"
-
-#include "line_string.hpp"
-#include "util.hpp"
-
-namespace mbgl {
-namespace android {
-namespace geojson {
-
-jni::Local<jni::Object<MultiLineString>> MultiLineString::New(jni::JNIEnv& env, const mbgl::MultiLineString<double>& multiLineString) {
-    static auto& javaClass = jni::Class<MultiLineString>::Singleton(env);
-    static auto method = javaClass.GetStaticMethod<jni::Object<MultiLineString> (jni::Object<java::util::List>)>(env, "fromLngLats");
-
-    return javaClass.Call(env, method, asPointsListsList(env, multiLineString));
-}
-
-mapbox::geojson::multi_line_string MultiLineString::convert(jni::JNIEnv &env, const jni::Object<MultiLineString>& jMultiLineString) {
-    mapbox::geojson::multi_line_string multiLineString;
-
-    if (jMultiLineString) {
-        multiLineString = MultiLineString::convert(env, MultiLineString::coordinates(env, jMultiLineString));
-    }
-
-    return multiLineString;
-}
-
-mapbox::geojson::multi_line_string MultiLineString::convert(jni::JNIEnv &env, const jni::Object<java::util::List/*<java::util::List<Point>>*/>& jPointListsList) {
-    mapbox::geojson::multi_line_string multiLineString;
-
-    if (jPointListsList) {
-        auto jPositionListsArray = java::util::List::toArray<java::util::List>(env, jPointListsList);
-
-        auto size = jPositionListsArray.Length(env);
-        multiLineString.reserve(size);
-
-        for (std::size_t i = 0; i < size; i++) {
-            multiLineString.push_back(LineString::convert(env, jPositionListsArray.Get(env, i)));
-        }
-    }
-
-    return multiLineString;
-}
-
-jni::Local<jni::Object<java::util::List>> MultiLineString::coordinates(jni::JNIEnv &env, const jni::Object<MultiLineString>& jLineString) {
-    static auto& javaClass = jni::Class<MultiLineString>::Singleton(env);
-    static auto method = javaClass.GetMethod<jni::Object<java::util::List> ()>(env, "coordinates");
-    return jLineString.Call(env, method);
-}
-
-void MultiLineString::registerNative(jni::JNIEnv &env) {
-    jni::Class<MultiLineString>::Singleton(env);
-}
-
-} // namespace geojson
-} // namespace android
-} // namespace mbgl
\ No newline at end of file
diff --git a/platform/android/src/geojson/multi_line_string.hpp b/platform/android/src/geojson/multi_line_string.hpp
deleted file mode 100644
index 65ce43bd1f..0000000000
--- a/platform/android/src/geojson/multi_line_string.hpp
+++ /dev/null
@@ -1,34 +0,0 @@
-#pragma once
-
-#include <mbgl/util/geojson.hpp>
-#include <mbgl/util/noncopyable.hpp>
-
-#include "../java/util.hpp"
-#include "geometry.hpp"
-
-#include <jni/jni.hpp>
-
-namespace mbgl {
-namespace android {
-namespace geojson {
-
-class MultiLineString {
-public:
-    using SuperTag = Geometry;
-    static constexpr auto Name() { return "com/mapbox/geojson/MultiLineString"; };
-    static constexpr auto Type() { return "MultiLineString"; };
-
-    static jni::Local<jni::Object<MultiLineString>> New(jni::JNIEnv&, const mbgl::MultiLineString<double>&);
-
-    static mapbox::geojson::multi_line_string convert(jni::JNIEnv&, const jni::Object<MultiLineString>&);
-
-    static mapbox::geojson::multi_line_string convert(jni::JNIEnv&, const jni::Object<java::util::List/*<java::util::List<Point>>*/>&);
-
-    static jni::Local<jni::Object<java::util::List>> coordinates(jni::JNIEnv&, const jni::Object<MultiLineString>&);
-
-    static void registerNative(jni::JNIEnv&);
-};
-
-} // namespace geojson
-} // namespace android
-} // namespace mbgl
\ No newline at end of file
diff --git a/platform/android/src/geojson/multi_point.cpp b/platform/android/src/geojson/multi_point.cpp
deleted file mode 100644
index d530ef721f..0000000000
--- a/platform/android/src/geojson/multi_point.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
-#include "multi_point.hpp"
-
-#include "line_string.hpp"
-
-#include "util.hpp"
-
-namespace mbgl {
-namespace android {
-namespace geojson {
-
-jni::Local<jni::Object<MultiPoint>> MultiPoint::New(JNIEnv& env, const mbgl::MultiPoint<double>& multiPoint) {
-    static auto& javaClass = jni::Class<MultiPoint>::Singleton(env);
-    static auto method = javaClass.GetStaticMethod<jni::Object<MultiPoint>(jni::Object<java::util::List>)>(env, "fromLngLats");
-
-    return javaClass.Call(env, method, asPointsList(env, multiPoint));
-}
-
-mapbox::geojson::multi_point MultiPoint::convert(jni::JNIEnv& env, const jni::Object<MultiPoint>& jMultiPoint) {
-    mapbox::geojson::multi_point multiPoint;
-
-    if (jMultiPoint) {
-        multiPoint = convertExplicit<mapbox::geojson::multi_point>(
-            LineString::convert(env, MultiPoint::coordinates(env, jMultiPoint)));
-    }
-
-    return multiPoint;
-}
-
-jni::Local<jni::Object<java::util::List>> MultiPoint::coordinates(jni::JNIEnv& env, const jni::Object<MultiPoint>& jMultiPoint) {
-    static auto& javaClass = jni::Class<MultiPoint>::Singleton(env);
-    static auto method = javaClass.GetMethod<jni::Object<java::util::List> ()>(env, "coordinates");
-    return jMultiPoint.Call(env, method);
-}
-
-void MultiPoint::registerNative(jni::JNIEnv &env) {
-    jni::Class<MultiPoint>::Singleton(env);
-}
-
-} // namespace geojson
-} // namespace android
-} // namespace mbgl
\ No newline at end of file
diff --git a/platform/android/src/geojson/multi_point.hpp b/platform/android/src/geojson/multi_point.hpp
deleted file mode 100644
index a3ca49b731..0000000000
--- a/platform/android/src/geojson/multi_point.hpp
+++ /dev/null
@@ -1,33 +0,0 @@
-#pragma once
-
-#include <mbgl/util/geojson.hpp>
-#include <mbgl/util/geometry.hpp>
-#include <mbgl/util/noncopyable.hpp>
-
-#include "geometry.hpp"
-#include "../java/util.hpp"
-
-#include <jni/jni.hpp>
-
-namespace mbgl {
-namespace android {
-namespace geojson {
-
-class MultiPoint {
-public:
-    using SuperTag = Geometry;
-    static constexpr auto Name() { return "com/mapbox/geojson/MultiPoint"; };
-    static constexpr auto Type() { return "MultiPoint"; };
-
-    static jni::Local<jni::Object<MultiPoint>> New(jni::JNIEnv&, const mbgl::MultiPoint<double>&);
-
-    static mapbox::geojson::multi_point convert(jni::JNIEnv&, const jni::Object<MultiPoint>&);
-
-    static jni::Local<jni::Object<java::util::List>> coordinates(jni::JNIEnv&, const jni::Object<MultiPoint>&);
-
-    static void registerNative(jni::JNIEnv&);
-};
-
-} // namespace geojson
-} // namespace android
-} // namespace mbgl
\ No newline at end of file
diff --git a/platform/android/src/geojson/multi_polygon.cpp b/platform/android/src/geojson/multi_polygon.cpp
deleted file mode 100644
index 3c5c3ec338..0000000000
--- a/platform/android/src/geojson/multi_polygon.cpp
+++ /dev/null
@@ -1,53 +0,0 @@
-#include "multi_polygon.hpp"
-
-#include "polygon.hpp"
-#include "util.hpp"
-
-namespace mbgl {
-namespace android {
-namespace geojson {
-
-jni::Local<jni::Object<MultiPolygon>> MultiPolygon::New(JNIEnv& env, const mbgl::MultiPolygon<double>& multiPolygon) {
-    static auto& javaClass = jni::Class<MultiPolygon>::Singleton(env);
-    static auto method = javaClass.GetStaticMethod<jni::Object<MultiPolygon> (jni::Object<java::util::List>)>(env, "fromLngLats");
-
-    auto jarray = jni::Array<jni::Object<java::util::List>>::New(env, multiPolygon.size());
-
-    for (size_t i = 0; i < multiPolygon.size(); i++) {
-        jarray.Set(env, i, asPointsListsList(env, multiPolygon.at(i)));
-    }
-
-    return javaClass.Call(env, method, java::util::Arrays::asList(env, jarray));
-}
-
-mapbox::geojson::multi_polygon MultiPolygon::convert(jni::JNIEnv& env, const jni::Object<MultiPolygon>& jMultiPolygon) {
-    mapbox::geojson::multi_polygon multiPolygon;
-
-    if (jMultiPolygon) {
-        auto jPointListsListList = MultiPolygon::coordinates(env, jMultiPolygon);
-        auto jPointListsListArray = java::util::List::toArray<java::util::List>(env, jPointListsListList);
-
-        auto size = jPointListsListArray.Length(env);
-        multiPolygon.reserve(size);
-
-        for (size_t i = 0; i < size; i++) {
-            multiPolygon.push_back(Polygon::convert(env, jPointListsListArray.Get(env, i)));
-        }
-    }
-
-    return multiPolygon;
-}
-
-jni::Local<jni::Object<java::util::List>> MultiPolygon::coordinates(jni::JNIEnv& env, const jni::Object<MultiPolygon>& jPolygon) {
-    static auto& javaClass = jni::Class<MultiPolygon>::Singleton(env);
-    static auto method = javaClass.GetMethod<jni::Object<java::util::List> ()>(env, "coordinates");
-    return jPolygon.Call(env, method);
-}
-
-void MultiPolygon::registerNative(jni::JNIEnv &env) {
-    jni::Class<MultiPolygon>::Singleton(env);
-}
-
-} // namespace geojson
-} // namespace android
-} // namespace mbgl
\ No newline at end of file
diff --git a/platform/android/src/geojson/multi_polygon.hpp b/platform/android/src/geojson/multi_polygon.hpp
deleted file mode 100644
index fd7b08016d..0000000000
--- a/platform/android/src/geojson/multi_polygon.hpp
+++ /dev/null
@@ -1,32 +0,0 @@
-#pragma once
-
-#include <mbgl/util/geojson.hpp>
-#include <mbgl/util/noncopyable.hpp>
-
-#include "../java/util.hpp"
-#include "geometry.hpp"
-
-#include <jni/jni.hpp>
-
-namespace mbgl {
-namespace android {
-namespace geojson {
-
-class MultiPolygon {
-public:
-    using SuperTag = Geometry;
-    static constexpr auto Name() { return "com/mapbox/geojson/MultiPolygon"; };
-    static constexpr auto Type() { return "MultiPolygon"; };
-
-    static jni::Local<jni::Object<MultiPolygon>> New(jni::JNIEnv&, const mbgl::MultiPolygon<double>&);
-
-    static mapbox::geojson::multi_polygon convert(jni::JNIEnv&, const jni::Object<MultiPolygon>&);
-
-    static jni::Local<jni::Object<java::util::List>> coordinates(jni::JNIEnv&, const jni::Object<MultiPolygon>&);
-
-    static void registerNative(jni::JNIEnv&);
-};
-
-} // namespace geojson
-} // namespace android
-} // namespace mbgl
\ No newline at end of file
diff --git a/platform/android/src/geojson/point.cpp b/platform/android/src/geojson/point.cpp
deleted file mode 100644
index 2000447c0f..0000000000
--- a/platform/android/src/geojson/point.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-#include "point.hpp"
-
-namespace mbgl {
-namespace android {
-namespace geojson {
-
-jni::Local<jni::Object<Point>> Point::New(jni::JNIEnv& env, const mbgl::Point<double>& point) {
-    static auto& javaClass = jni::Class<Point>::Singleton(env);
-    static auto method = javaClass.GetStaticMethod<jni::Object<Point> (jni::jdouble, jni::jdouble)>(env, "fromLngLat");
-    return javaClass.Call(env, method, point.x, point.y);
-}
-
-mbgl::Point<double> Point::convert(jni::JNIEnv &env, const jni::Object<Point>& jPoint) {
-    static auto& javaClass = jni::Class<Point>::Singleton(env);
-    static auto longitude = javaClass.GetMethod<jni::jdouble ()>(env, "longitude");
-    static auto latitude = javaClass.GetMethod<jni::jdouble ()>(env, "latitude");
-
-    if (!jPoint) {
-        return {};
-    }
-
-    return {
-        jPoint.Call(env, longitude),
-        jPoint.Call(env, latitude)
-    };
-}
-
-void Point::registerNative(jni::JNIEnv &env) {
-    jni::Class<Point>::Singleton(env);
-}
-
-} // namespace geojson
-} // namespace android
-} // namespace mbgl
diff --git a/platform/android/src/geojson/point.hpp b/platform/android/src/geojson/point.hpp
deleted file mode 100644
index b5d71ecae1..0000000000
--- a/platform/android/src/geojson/point.hpp
+++ /dev/null
@@ -1,27 +0,0 @@
-#pragma once
-
-#include <mbgl/util/geometry.hpp>
-
-#include "geometry.hpp"
-
-#include <jni/jni.hpp>
-
-namespace mbgl {
-namespace android {
-namespace geojson {
-
-class Point {
-public:
-    using SuperTag = Geometry;
-    static constexpr auto Name() { return "com/mapbox/geojson/Point"; };
-    static constexpr auto Type() { return "Point"; };
-
-    static jni::Local<jni::Object<Point>> New(jni::JNIEnv&, const mbgl::Point<double>&);
-    static mbgl::Point<double> convert(jni::JNIEnv&, const jni::Object<Point>&);
-
-    static void registerNative(jni::JNIEnv&);
-};
-
-} // namespace geojson
-} // namespace android
-} // namespace mbgl
\ No newline at end of file
diff --git a/platform/android/src/geojson/polygon.cpp b/platform/android/src/geojson/polygon.cpp
deleted file mode 100644
index 4437d134a8..0000000000
--- a/platform/android/src/geojson/polygon.cpp
+++ /dev/null
@@ -1,55 +0,0 @@
-#include "polygon.hpp"
-
-#include "multi_line_string.hpp"
-
-#include "util.hpp"
-
-namespace mbgl {
-namespace android {
-namespace geojson {
-
-jni::Local<jni::Object<Polygon>> Polygon::New(jni::JNIEnv& env, const mbgl::Polygon<double>& polygon) {
-    static auto& javaClass = jni::Class<Polygon>::Singleton(env);
-    static auto method = javaClass.GetStaticMethod<jni::Object<Polygon> (jni::Object<java::util::List>)>(env, "fromLngLats");
-
-    return javaClass.Call(env, method, asPointsListsList(env, polygon));
-}
-
-mapbox::geojson::polygon Polygon::convert(jni::JNIEnv &env, const jni::Object<Polygon>& jPolygon) {
-    mapbox::geojson::polygon polygon;
-
-    if (jPolygon) {
-        polygon = Polygon::convert(env, Polygon::coordinates(env, jPolygon));
-    }
-
-    return polygon;
-}
-
-mapbox::geojson::polygon Polygon::convert(jni::JNIEnv &env, const jni::Object<java::util::List/*<java::util::List<Point>>*/>& jPointListsList) {
-    mapbox::geojson::polygon polygon;
-
-    if (jPointListsList) {
-        auto multiLine = MultiLineString::convert(env, jPointListsList);
-        polygon.reserve(multiLine.size());
-        for (auto&& line : multiLine) {
-            polygon.emplace_back(convertExplicit<mapbox::geojson::linear_ring>(std::move(line)));
-        }
-    }
-
-    return polygon;
-}
-
-
-jni::Local<jni::Object<java::util::List>> Polygon::coordinates(jni::JNIEnv &env, const jni::Object<Polygon>& jPolygon) {
-    static auto& javaClass = jni::Class<Polygon>::Singleton(env);
-    static auto method = javaClass.GetMethod<jni::Object<java::util::List> ()>(env, "coordinates");
-    return jPolygon.Call(env, method);
-}
-
-void Polygon::registerNative(jni::JNIEnv &env) {
-    jni::Class<Polygon>::Singleton(env);
-}
-
-} // namespace geojson
-} // namespace android
-} // namespace mbgl
\ No newline at end of file
diff --git a/platform/android/src/geojson/polygon.hpp b/platform/android/src/geojson/polygon.hpp
deleted file mode 100644
index 8e1761feda..0000000000
--- a/platform/android/src/geojson/polygon.hpp
+++ /dev/null
@@ -1,35 +0,0 @@
-#pragma once
-
-#include <mbgl/util/geojson.hpp>
-#include <mbgl/util/noncopyable.hpp>
-
-#include "geometry.hpp"
-#include "../java/util.hpp"
-
-#include <jni/jni.hpp>
-
-
-namespace mbgl {
-namespace android {
-namespace geojson {
-
-class Polygon {
-public:
-    using SuperTag = Geometry;
-    static constexpr auto Name() { return "com/mapbox/geojson/Polygon"; };
-    static constexpr auto Type() { return "Polygon"; };
-
-    static jni::Local<jni::Object<Polygon>> New(jni::JNIEnv&, const mbgl::Polygon<double>&);
-
-    static mapbox::geojson::polygon convert(jni::JNIEnv &, const jni::Object<Polygon>&);
-
-    static mapbox::geojson::polygon convert(jni::JNIEnv&, const jni::Object<java::util::List/*<java::util::List<Point>>*/>&);
-
-    static jni::Local<jni::Object<java::util::List>> coordinates(jni::JNIEnv&, const jni::Object<Polygon>&);
-
-    static void registerNative(jni::JNIEnv &);
-};
-
-} // namespace geojson
-} // namespace android
-} // namespace mbgl
\ No newline at end of file
diff --git a/platform/android/src/geojson/util.hpp b/platform/android/src/geojson/util.hpp
deleted file mode 100644
index 59154516fa..0000000000
--- a/platform/android/src/geojson/util.hpp
+++ /dev/null
@@ -1,52 +0,0 @@
-#pragma once
-
-#include "point.hpp"
-
-#include <type_traits>
-
-namespace mbgl {
-namespace android {
-namespace geojson {
-
-// Clang 3.8 fails to implicitly convert matching types, so we'll have to do it explicitly.
-template <typename To, typename From>
-To convertExplicit(From&& src) {
-    static_assert(std::is_same<typename std::decay_t<From>::container_type,
-                               typename To::container_type>::value,
-                  "container types do not match");
-    static_assert(std::is_rvalue_reference<From&&>::value,
-                  "argument must be rvalue reference");
-    return *reinterpret_cast<std::add_pointer_t<To>>(&src);
-}
-
-/**
- *  Geometry -> List<Point>
- */
-template <class T>
-static jni::Local<jni::Object<java::util::List>> asPointsList(jni::JNIEnv& env, const T& pointsList) {
-    auto jarray = jni::Array<jni::Object<Point>>::New(env, pointsList.size());
-
-    for (jni::jsize i = 0; i < pointsList.size(); i++) {
-        jarray.Set(env, i, Point::New(env, pointsList.at(i)));
-    }
-
-    return java::util::Arrays::asList(env, jarray);
-}
-
-/**
- *  Geometry -> List<List<Point>>
- */
-template <class SHAPE>
-static jni::Local<jni::Object<java::util::List>> asPointsListsList(JNIEnv& env, const SHAPE& value) {
-    auto jarray = jni::Array<jni::Object<java::util::List>>::New(env, value.size());
-
-    for (size_t i = 0; i < value.size(); i++) {
-        jarray.Set(env, i, asPointsList(env, value[i]));
-    }
-
-    return java::util::Arrays::asList(env, jarray);
-}
-
-} // namespace geojson
-} // namespace android
-} // namespace mbgl
diff --git a/platform/android/src/geometry/lat_lng.cpp b/platform/android/src/geometry/lat_lng.cpp
deleted file mode 100644
index 5d8313cb2a..0000000000
--- a/platform/android/src/geometry/lat_lng.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
-#include "lat_lng.hpp"
-
-namespace mbgl {
-namespace android {
-
-jni::Local<jni::Object<LatLng>> LatLng::New(jni::JNIEnv& env, const mbgl::LatLng& latLng) {
-    static auto& javaClass = jni::Class<LatLng>::Singleton(env);
-    static auto constructor = javaClass.GetConstructor<double, double>(env);
-    return javaClass.New(env, constructor, latLng.latitude(), latLng.longitude());
-}
-
-mbgl::Point<double> LatLng::getGeometry(jni::JNIEnv& env, const jni::Object<LatLng>& latLng) {
-    static auto& javaClass = jni::Class<LatLng>::Singleton(env);
-    static auto latitudeField = javaClass.GetField<jni::jdouble>(env, "latitude");
-    static auto longitudeField = javaClass.GetField<jni::jdouble>(env, "longitude");
-    return mbgl::Point<double>(latLng.Get(env, longitudeField), latLng.Get(env, latitudeField));
-}
-
-mbgl::LatLng LatLng::getLatLng(jni::JNIEnv& env, const jni::Object<LatLng>& latLng) {
-    auto point = LatLng::getGeometry(env, latLng);
-    return mbgl::LatLng(point.y, point.x);
-}
-
-void LatLng::registerNative(jni::JNIEnv& env) {
-    jni::Class<LatLng>::Singleton(env);
-}
-
-} // namespace android
-} // namespace mbgl
\ No newline at end of file
diff --git a/platform/android/src/geometry/lat_lng.hpp b/platform/android/src/geometry/lat_lng.hpp
deleted file mode 100644
index 30b7db1ef3..0000000000
--- a/platform/android/src/geometry/lat_lng.hpp
+++ /dev/null
@@ -1,29 +0,0 @@
-#pragma once
-
-#include <mbgl/util/noncopyable.hpp>
-#include <mbgl/util/geo.hpp>
-#include <mbgl/util/geometry.hpp>
-
-#include <jni/jni.hpp>
-
-namespace mbgl {
-namespace android {
-
-class LatLng : private mbgl::util::noncopyable {
-public:
-
-    static constexpr auto Name() { return "com/mapbox/mapboxsdk/geometry/LatLng"; };
-
-    static jni::Local<jni::Object<LatLng>> New(jni::JNIEnv&, const mbgl::LatLng&);
-
-    static mbgl::Point<double> getGeometry(jni::JNIEnv&, const jni::Object<LatLng>&);
-
-    static mbgl::LatLng getLatLng(jni::JNIEnv&, const jni::Object<LatLng>&);
-
-
-    static void registerNative(jni::JNIEnv&);
-};
-
-
-} // namespace android
-} // namespace mbgl
\ No newline at end of file
diff --git a/platform/android/src/geometry/lat_lng_bounds.cpp b/platform/android/src/geometry/lat_lng_bounds.cpp
deleted file mode 100644
index cf534a06e4..0000000000
--- a/platform/android/src/geometry/lat_lng_bounds.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
-#include "lat_lng_bounds.hpp"
-
-namespace mbgl {
-namespace android {
-
-jni::Local<jni::Object<LatLngBounds>> LatLngBounds::New(jni::JNIEnv& env, mbgl::LatLngBounds bounds) {
-    static auto& javaClass = jni::Class<LatLngBounds>::Singleton(env);
-    static auto constructor = javaClass.GetConstructor<double, double, double, double>(env);
-    return javaClass.New(env, constructor, bounds.north(), bounds.east(), bounds.south(), bounds.west());
-}
-
-mbgl::LatLngBounds LatLngBounds::getLatLngBounds(jni::JNIEnv& env, const jni::Object<LatLngBounds>& bounds) {
-    static auto& javaClass = jni::Class<LatLngBounds>::Singleton(env);
-    static auto swLatField = javaClass.GetField<jni::jdouble>(env, "latitudeSouth");
-    static auto swLonField = javaClass.GetField<jni::jdouble>(env, "longitudeWest");
-    static auto neLatField = javaClass.GetField<jni::jdouble>(env, "latitudeNorth");
-    static auto neLonField = javaClass.GetField<jni::jdouble>(env, "longitudeEast");
-
-    mbgl::LatLng sw = { bounds.Get(env, swLatField), bounds.Get(env, swLonField) };
-    mbgl::LatLng ne = { bounds.Get(env, neLatField), bounds.Get(env, neLonField) };
-
-    return mbgl::LatLngBounds::hull(sw, ne);
-}
-
-void LatLngBounds::registerNative(jni::JNIEnv& env) {
-    jni::Class<LatLngBounds>::Singleton(env);
-}
-
-} // namespace android
-} // namespace mbgl
\ No newline at end of file
diff --git a/platform/android/src/geometry/lat_lng_bounds.hpp b/platform/android/src/geometry/lat_lng_bounds.hpp
deleted file mode 100644
index d51026711d..0000000000
--- a/platform/android/src/geometry/lat_lng_bounds.hpp
+++ /dev/null
@@ -1,26 +0,0 @@
-#pragma once
-
-#include <mbgl/util/noncopyable.hpp>
-#include <mbgl/util/geo.hpp>
-#include <mbgl/util/geometry.hpp>
-
-#include <jni/jni.hpp>
-
-namespace mbgl {
-namespace android {
-
-class LatLngBounds : private mbgl::util::noncopyable {
-public:
-
-    static constexpr auto Name() { return "com/mapbox/mapboxsdk/geometry/LatLngBounds"; };
-
-    static jni::Local<jni::Object<LatLngBounds>> New(jni::JNIEnv&, mbgl::LatLngBounds);
-
-    static mbgl::LatLngBounds getLatLngBounds(jni::JNIEnv&, const jni::Object<LatLngBounds>&);
-
-    static void registerNative(jni::JNIEnv&);
-};
-
-
-} // namespace android
-} // namespace mbgl
\ No newline at end of file
diff --git a/platform/android/src/geometry/lat_lng_quad.cpp b/platform/android/src/geometry/lat_lng_quad.cpp
deleted file mode 100644
index 1a1e49048b..0000000000
--- a/platform/android/src/geometry/lat_lng_quad.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
-#include "lat_lng_quad.hpp"
-#include "lat_lng.hpp"
-
-namespace mbgl {
-namespace android {
-
-jni::Local<jni::Object<LatLngQuad>> LatLngQuad::New(jni::JNIEnv& env, std::array<mbgl::LatLng, 4> coordinates) {
-    static auto& javaClass = jni::Class<LatLngQuad>::Singleton(env);
-    static auto quadConstructor = javaClass.GetConstructor<jni::Object<LatLng>, jni::Object<LatLng>, jni::Object<LatLng>, jni::Object<LatLng>>(env);
-    return javaClass.New(env, quadConstructor,
-        LatLng::New(env, coordinates[0]),
-        LatLng::New(env, coordinates[1]),
-        LatLng::New(env, coordinates[2]),
-        LatLng::New(env, coordinates[3]));
-}
-
-std::array<mbgl::LatLng, 4> LatLngQuad::getLatLngArray(jni::JNIEnv& env, const jni::Object<LatLngQuad>& quad) {
-    static auto& javaClass = jni::Class<LatLngQuad>::Singleton(env);
-    static auto topLeftField = javaClass.GetField <jni::Object<LatLng>>(env, "topLeft");
-    static auto topRightField = javaClass.GetField <jni::Object<LatLng>>(env, "topRight");
-    static auto bottomRightField = javaClass.GetField <jni::Object<LatLng>>(env, "bottomRight");
-    static auto bottomLeftField = javaClass.GetField <jni::Object<LatLng>>(env, "bottomLeft");
-
-    return std::array < mbgl::LatLng, 4 > {{
-        LatLng::getLatLng(env, quad.Get(env, topLeftField)),
-        LatLng::getLatLng(env, quad.Get(env, topRightField)),
-        LatLng::getLatLng(env, quad.Get(env, bottomRightField)),
-        LatLng::getLatLng(env, quad.Get(env, bottomLeftField))
-    }};
-}
-
-void LatLngQuad::registerNative(jni::JNIEnv& env) {
-    jni::Class<LatLngQuad>::Singleton(env);
-}
-
-} // namespace android
-} // namespace mbgl
\ No newline at end of file
diff --git a/platform/android/src/geometry/lat_lng_quad.hpp b/platform/android/src/geometry/lat_lng_quad.hpp
deleted file mode 100644
index f6560b57ba..0000000000
--- a/platform/android/src/geometry/lat_lng_quad.hpp
+++ /dev/null
@@ -1,27 +0,0 @@
-#pragma once
-
-#include <mbgl/util/noncopyable.hpp>
-#include <mbgl/util/geo.hpp>
-#include <mbgl/util/geometry.hpp>
-
-#include <jni/jni.hpp>
-#include <array>
-
-namespace mbgl {
-namespace android {
-
-class LatLngQuad : private mbgl::util::noncopyable {
-public:
-
-    static constexpr auto Name() { return "com/mapbox/mapboxsdk/geometry/LatLngQuad"; };
-
-    static jni::Local<jni::Object<LatLngQuad>> New(jni::JNIEnv&, std::array<mbgl::LatLng, 4>);
-
-    static std::array<mbgl::LatLng, 4> getLatLngArray(jni::JNIEnv&, const jni::Object<LatLngQuad>&);
-
-    static void registerNative(jni::JNIEnv&);
-};
-
-
-} // namespace android
-} // namespace mbgl
\ No newline at end of file
diff --git a/platform/android/src/geometry/projected_meters.cpp b/platform/android/src/geometry/projected_meters.cpp
deleted file mode 100644
index e079de0062..0000000000
--- a/platform/android/src/geometry/projected_meters.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-#include "projected_meters.hpp"
-
-namespace mbgl {
-namespace android {
-
-jni::Local<jni::Object<ProjectedMeters>> ProjectedMeters::New(jni::JNIEnv& env, double northing, double easting) {
-    static auto& javaClass = jni::Class<ProjectedMeters>::Singleton(env);
-    static auto constructor = javaClass.GetConstructor<double, double>(env);
-    return javaClass.New(env, constructor, northing, easting);
-}
-
-void ProjectedMeters::registerNative(jni::JNIEnv& env) {
-    jni::Class<ProjectedMeters>::Singleton(env);
-}
-
-} // namespace android
-} // namespace mbgl
\ No newline at end of file
diff --git a/platform/android/src/geometry/projected_meters.hpp b/platform/android/src/geometry/projected_meters.hpp
deleted file mode 100644
index baad1efc81..0000000000
--- a/platform/android/src/geometry/projected_meters.hpp
+++ /dev/null
@@ -1,21 +0,0 @@
-#pragma once
-
-#include <mbgl/util/noncopyable.hpp>
-#include <mbgl/util/geometry.hpp>
-
-#include <jni/jni.hpp>
-
-namespace mbgl {
-namespace android {
-
-class ProjectedMeters : private mbgl::util::noncopyable {
-public:
-    static constexpr auto Name() { return "com/mapbox/mapboxsdk/geometry/ProjectedMeters"; };
-
-    static jni::Local<jni::Object<ProjectedMeters>> New(jni::JNIEnv&, double, double);
-
-    static void registerNative(jni::JNIEnv&);
-};
-
-} // namespace android
-} // namespace mbgl
\ No newline at end of file
diff --git a/platform/android/src/graphics/pointf.cpp b/platform/android/src/graphics/pointf.cpp
deleted file mode 100644
index 2fc762d6e9..0000000000
--- a/platform/android/src/graphics/pointf.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-#include <mbgl/util/geo.hpp>
-#include "pointf.hpp"
-
-namespace mbgl {
-namespace android {
-
-jni::Local<jni::Object<PointF>> PointF::New(jni::JNIEnv& env, float x, float y) {
-    static auto& javaClass = jni::Class<PointF>::Singleton(env);
-    static auto constructor = javaClass.GetConstructor<float, float>(env);
-    return javaClass.New(env, constructor, x, y);
-}
-
-mbgl::ScreenCoordinate PointF::getScreenCoordinate(jni::JNIEnv& env, const jni::Object<PointF>& point) {
-    static auto& javaClass = jni::Class<PointF>::Singleton(env);
-    static auto xField = javaClass.GetField<jni::jfloat>(env, "x");
-    static auto yField = javaClass.GetField<jni::jfloat>(env, "y");
-    return mbgl::ScreenCoordinate{point.Get(env, xField), point.Get(env, yField)};
-}
-
-void PointF::registerNative(jni::JNIEnv& env) {
-    jni::Class<PointF>::Singleton(env);
-}
-
-} // namespace android
-} // namespace mbgl
\ No newline at end of file
diff --git a/platform/android/src/graphics/pointf.hpp b/platform/android/src/graphics/pointf.hpp
deleted file mode 100644
index 899468b8e3..0000000000
--- a/platform/android/src/graphics/pointf.hpp
+++ /dev/null
@@ -1,24 +0,0 @@
-#pragma once
-
-#include <mbgl/util/noncopyable.hpp>
-
-#include <jni/jni.hpp>
-
-namespace mbgl {
-namespace android {
-
-class PointF : private mbgl::util::noncopyable {
-public:
-
-    static constexpr auto Name() { return "android/graphics/PointF"; };
-
-    static jni::Local<jni::Object<PointF>> New(jni::JNIEnv&, float, float);
-
-    static mbgl::ScreenCoordinate getScreenCoordinate(jni::JNIEnv&, const jni::Object<PointF>&);
-
-    static void registerNative(jni::JNIEnv&);
-};
-
-
-} // namespace android
-} // namespace mbgl
\ No newline at end of file
diff --git a/platform/android/src/graphics/rectf.cpp b/platform/android/src/graphics/rectf.cpp
deleted file mode 100644
index 8f418da037..0000000000
--- a/platform/android/src/graphics/rectf.cpp
+++ /dev/null
@@ -1,35 +0,0 @@
-#include "rectf.hpp"
-
-namespace mbgl {
-namespace android {
-
-float RectF::getLeft(jni::JNIEnv& env, const jni::Object<RectF>& rectf) {
-    static auto& javaClass = jni::Class<RectF>::Singleton(env);
-    static auto field = javaClass.GetField<float>(env, "left");
-    return rectf.Get(env, field);
-}
-
-float RectF::getTop(jni::JNIEnv& env, const jni::Object<RectF>& rectf) {
-    static auto& javaClass = jni::Class<RectF>::Singleton(env);
-    static auto field = javaClass.GetField<float>(env, "top");
-    return rectf.Get(env, field);
-}
-
-float RectF::getRight(jni::JNIEnv& env, const jni::Object<RectF>& rectf) {
-    static auto& javaClass = jni::Class<RectF>::Singleton(env);
-    static auto field = javaClass.GetField<float>(env, "right");
-    return rectf.Get(env, field);
-}
-
-float RectF::getBottom(jni::JNIEnv& env, const jni::Object<RectF>& rectf) {
-    static auto& javaClass = jni::Class<RectF>::Singleton(env);
-    static auto field = javaClass.GetField<float>(env, "bottom");
-    return rectf.Get(env, field);
-}
-
-void RectF::registerNative(jni::JNIEnv& env) {
-    jni::Class<RectF>::Singleton(env);
-}
-
-} // namespace android
-} // namespace mbgl
\ No newline at end of file
diff --git a/platform/android/src/graphics/rectf.hpp b/platform/android/src/graphics/rectf.hpp
deleted file mode 100644
index ba611f2262..0000000000
--- a/platform/android/src/graphics/rectf.hpp
+++ /dev/null
@@ -1,28 +0,0 @@
-#pragma once
-
-#include <mbgl/util/noncopyable.hpp>
-
-#include <jni/jni.hpp>
-
-namespace mbgl {
-namespace android {
-
-class RectF : private mbgl::util::noncopyable {
-public:
-
-    static constexpr auto Name() { return "android/graphics/RectF"; };
-
-    static float getLeft(jni::JNIEnv&, const jni::Object<RectF>&);
-
-    static float getTop(jni::JNIEnv&, const jni::Object<RectF>&);
-
-    static float getRight(jni::JNIEnv&, const jni::Object<RectF>&);
-
-    static float getBottom(jni::JNIEnv&, const jni::Object<RectF>&);
-
-    static void registerNative(jni::JNIEnv&);
-};
-
-
-} // namespace android
-} // namespace mbgl
\ No newline at end of file
diff --git a/platform/android/src/gson/json_array.cpp b/platform/android/src/gson/json_array.cpp
deleted file mode 100644
index 8ffa658b76..0000000000
--- a/platform/android/src/gson/json_array.cpp
+++ /dev/null
@@ -1,50 +0,0 @@
-#include "json_array.hpp"
-#include "json_element.hpp"
-
-namespace mbgl {
-namespace android {
-namespace gson {
-
-jni::Local<jni::Object<JsonArray>> JsonArray::New(jni::JNIEnv& env, const std::vector<mbgl::Value>& values){
-    static auto& javaClass = jni::Class<JsonArray>::Singleton(env);
-    static auto constructor = javaClass.GetConstructor(env);
-    static auto addMethod = javaClass.GetMethod<void (jni::Object<JsonElement>)>(env, "add");
-
-    auto jsonArray = javaClass.New(env, constructor);
-
-    for (const auto &v : values) {
-        jsonArray.Call(env, addMethod, JsonElement::New(env, v));
-    }
-
-    return jsonArray;
-}
-
-std::vector<mbgl::Value> JsonArray::convert(jni::JNIEnv& env, const jni::Object<JsonArray>& jsonArray) {
-    std::vector<mbgl::Value> values;
-
-    if (jsonArray) {
-        static auto& javaClass = jni::Class<JsonArray>::Singleton(env);
-        static auto getMethod = javaClass.GetMethod<jni::Object<JsonElement> (jni::jint)>(env, "get");
-        static auto sizeMethod = javaClass.GetMethod<jni::jint ()>(env, "size");
-
-        int size = jsonArray.Call(env, sizeMethod);
-        values.reserve(uint(size));
-
-        for (int i = 0; i < size; i++) {
-            auto entry = jsonArray.Call(env, getMethod, i);
-            if (entry) {
-                values.push_back(JsonElement::convert(env, entry));
-            }
-        }
-    }
-
-    return values;
-}
-
-void JsonArray::registerNative(jni::JNIEnv& env) {
-    jni::Class<JsonArray>::Singleton(env);
-}
-
-} // namespace gson
-} // namespace android
-} // namespace mbgl
\ No newline at end of file
diff --git a/platform/android/src/gson/json_array.hpp b/platform/android/src/gson/json_array.hpp
deleted file mode 100644
index 24d5d3d291..0000000000
--- a/platform/android/src/gson/json_array.hpp
+++ /dev/null
@@ -1,24 +0,0 @@
-#pragma once
-
-#include "json_element.hpp"
-
-#include <jni/jni.hpp>
-
-namespace mbgl {
-namespace android {
-namespace gson {
-
-class JsonArray {
-public:
-    using SuperTag = JsonElement;
-    static constexpr auto Name() { return "com/google/gson/JsonArray"; };
-
-    static jni::Local<jni::Object<JsonArray>> New(jni::JNIEnv&, const std::vector<mbgl::Value>&);
-    static std::vector<mbgl::Value> convert(JNIEnv&, const jni::Object<JsonArray>&);
-
-    static void registerNative(jni::JNIEnv&);
-};
-
-} // namespace gson
-} // namespace android
-} // namespace mbgl
\ No newline at end of file
diff --git a/platform/android/src/gson/json_element.cpp b/platform/android/src/gson/json_element.cpp
deleted file mode 100644
index ba22304d07..0000000000
--- a/platform/android/src/gson/json_element.cpp
+++ /dev/null
@@ -1,88 +0,0 @@
-#include "json_element.hpp"
-#include "json_array.hpp"
-#include "json_object.hpp"
-#include "json_primitive.hpp"
-
-namespace mbgl {
-namespace android {
-namespace gson {
-
-jni::Local<jni::Object<JsonElement>> JsonElement::New(jni::JNIEnv& env, const mbgl::Value& value) {
-    static auto& primitive = jni::Class<JsonPrimitive>::Singleton(env);
-    static auto stringConstructor = primitive.GetConstructor<jni::String>(env);
-    static auto numberConstructor = primitive.GetConstructor<jni::Number>(env);
-    static auto booleanConstructor = primitive.GetConstructor<jni::Boolean>(env);
-
-    return value.match(
-        [&] (const mbgl::NullValue&) {
-            return jni::Local<jni::Object<JsonElement>>();
-        },
-        [&] (const std::string& value) {
-            return primitive.New(env, stringConstructor, jni::Make<jni::String>(env, value));
-        },
-        [&] (const double value) {
-            return primitive.New(env, numberConstructor, jni::Box(env, value));
-        },
-        [&] (const int64_t value) {
-            return primitive.New(env, numberConstructor, jni::Box(env, value));
-        },
-        [&] (const uint64_t value) {
-            return primitive.New(env, numberConstructor, jni::Box(env, int64_t(value))); // TODO: should use BigInteger
-        },
-        [&] (const bool value) {
-            return primitive.New(env, booleanConstructor, jni::Box(env, value ? jni::jni_true : jni::jni_false));
-        },
-        [&] (const std::vector<mbgl::Value>& values) {
-            return JsonArray::New(env, values);
-        },
-        [&] (const mbgl::PropertyMap& values) {
-            return JsonObject::New(env, values);
-        }
-    );
-}
-
-mbgl::Value JsonElement::convert(jni::JNIEnv &env, const jni::Object<JsonElement>& jsonElement) {
-    if (!jsonElement) {
-        return mbgl::NullValue();
-    }
-
-    static auto& elementClass = jni::Class<JsonElement>::Singleton(env);
-    static auto isJsonObject = elementClass.GetMethod<jni::jboolean ()>(env, "isJsonObject");
-    static auto isJsonArray = elementClass.GetMethod<jni::jboolean ()>(env, "isJsonArray");
-    static auto isJsonPrimitive = elementClass.GetMethod<jni::jboolean ()>(env, "isJsonPrimitive");
-
-    static auto& primitiveClass = jni::Class<JsonPrimitive>::Singleton(env);
-    static auto isBoolean = primitiveClass.GetMethod<jni::jboolean ()>(env, "isBoolean");
-    static auto isString = primitiveClass.GetMethod<jni::jboolean ()>(env, "isString");
-    static auto isNumber = primitiveClass.GetMethod<jni::jboolean ()>(env, "isNumber");
-    static auto getAsBoolean = primitiveClass.GetMethod<jni::jboolean ()>(env, "getAsBoolean");
-    static auto getAsString = primitiveClass.GetMethod<jni::String ()>(env, "getAsString");
-    static auto getAsDouble = primitiveClass.GetMethod<jni::jdouble ()>(env, "getAsDouble");
-
-    if (jsonElement.Call(env, isJsonPrimitive)) {
-        auto primitive = jni::Cast(env, primitiveClass, jsonElement);
-        if (primitive.Call(env, isBoolean)) {
-            return bool(primitive.Call(env, getAsBoolean));
-        } else if (primitive.Call(env, isNumber)) {
-            return primitive.Call(env, getAsDouble);
-        } else if (primitive.Call(env, isString)) {
-            return jni::Make<std::string>(env, primitive.Call(env, getAsString));
-        } else {
-            return mbgl::NullValue();
-        }
-    } else if (jsonElement.Call(env, isJsonObject)) {
-        return JsonObject::convert(env, jni::Cast(env, jni::Class<JsonObject>::Singleton(env), jsonElement));
-    } else if (jsonElement.Call(env, isJsonArray)) {
-        return JsonArray::convert(env, jni::Cast(env, jni::Class<JsonArray>::Singleton(env), jsonElement));
-    } else {
-        return mbgl::NullValue();
-    }
-}
-
-void JsonElement::registerNative(jni::JNIEnv &env) {
-    jni::Class<JsonElement>::Singleton(env);
-}
-
-} // namespace gson
-} // namespace android
-} // namespace mbgl
\ No newline at end of file
diff --git a/platform/android/src/gson/json_element.hpp b/platform/android/src/gson/json_element.hpp
deleted file mode 100644
index e3b8a0268d..0000000000
--- a/platform/android/src/gson/json_element.hpp
+++ /dev/null
@@ -1,24 +0,0 @@
-#pragma once
-
-#include <mbgl/util/feature.hpp>
-
-#include <jni/jni.hpp>
-
-namespace mbgl {
-namespace android {
-namespace gson {
-
-class JsonElement {
-public:
-    using SuperTag = jni::ObjectTag;
-    static constexpr auto Name() { return "com/google/gson/JsonElement"; };
-
-    static jni::Local<jni::Object<JsonElement>> New(jni::JNIEnv&, const mbgl::Value&);
-    static mbgl::Value convert(JNIEnv&, const jni::Object<JsonElement>&);
-
-    static void registerNative(jni::JNIEnv&);
-};
-
-} // namespace gson
-} // namespace android
-} // namespace mbgl
\ No newline at end of file
diff --git a/platform/android/src/gson/json_object.cpp b/platform/android/src/gson/json_object.cpp
deleted file mode 100644
index 10d244ee48..0000000000
--- a/platform/android/src/gson/json_object.cpp
+++ /dev/null
@@ -1,65 +0,0 @@
-#include "json_object.hpp"
-
-#include "json_element.hpp"
-
-#include "../java/util.hpp"
-
-namespace mbgl {
-namespace android {
-namespace gson {
-
-
-jni::Local<jni::Object<JsonObject>> JsonObject::New(jni::JNIEnv& env, const mbgl::PropertyMap& values) {
-    static auto& javaClass = jni::Class<JsonObject>::Singleton(env);
-    static auto constructor = javaClass.GetConstructor(env);
-    static auto addMethod = javaClass.GetMethod<void (jni::String, jni::Object<JsonElement>)>(env, "add");
-
-    auto jsonObject = javaClass.New(env, constructor);
-
-    for (auto &item : values) {
-        jsonObject.Call(env, addMethod,
-            jni::Make<jni::String>(env, item.first),
-            JsonElement::New(env, item.second));
-    }
-
-    return jsonObject;
-}
-
-template <typename F> // void (jni::String, jni::Object<gson::JsonElement>)
-static void iterateEntrySet(jni::JNIEnv& env, const jni::Object<JsonObject>& jsonObject, F callback) {
-    // Get Set<Map.Entry<String, JsonElement>>
-    static auto& javaClass = jni::Class<JsonObject>::Singleton(env);
-    static auto method = javaClass.GetMethod<jni::Object<java::util::Set> ()>(env, "entrySet");
-
-    auto entryArray = java::util::Set::toArray<java::util::Map::Entry>(env, jsonObject.Call(env, method));
-
-    size_t size = entryArray.Length(env);
-    for (size_t i = 0; i < size; i++) {
-        auto entry = entryArray.Get(env, i);
-        if (entry) {
-            callback(
-                java::util::Map::Entry::getKey<jni::StringTag>(env, entry),
-                java::util::Map::Entry::getValue<gson::JsonElement>(env, entry));
-        }
-    }
-}
-
-mbgl::PropertyMap JsonObject::convert(jni::JNIEnv& env, const jni::Object<JsonObject>& jsonObject) {
-    mbgl::PropertyMap map;
-
-    if (jsonObject) {
-        iterateEntrySet(env, jsonObject, [&map, &env](const jni::String& jId, const jni::Object<gson::JsonElement>& jsonElement) {
-            map[jni::Make<std::string>(env, jId)] = JsonElement::convert(env, jsonElement);
-        });
-    }
-
-    return map;
-}
-
-void JsonObject::registerNative(jni::JNIEnv &env) {
-    jni::Class<JsonObject>::Singleton(env);
-}
-
-} // namespace gson
-} // namespace android
-} // namespace mbgl
\ No newline at end of file
diff --git a/platform/android/src/gson/json_object.hpp b/platform/android/src/gson/json_object.hpp
deleted file mode 100644
index b8916f8ae1..0000000000
--- a/platform/android/src/gson/json_object.hpp
+++ /dev/null
@@ -1,24 +0,0 @@
-#pragma once
-
-#include "json_element.hpp"
-
-#include <jni/jni.hpp>
-
-namespace mbgl {
-namespace android {
-namespace gson {
-
-class JsonObject {
-public:
-    using SuperTag = JsonElement;
-    static constexpr auto Name() { return "com/google/gson/JsonObject"; };
-
-    static jni::Local<jni::Object<JsonObject>> New(jni::JNIEnv&, const mbgl::PropertyMap&);
-    static mbgl::PropertyMap convert(JNIEnv&, const jni::Object<JsonObject>&);
-
-    static void registerNative(jni::JNIEnv&);
-};
-
-} // namespace gson
-} // namespace android
-} // namespace mbgl
\ No newline at end of file
diff --git a/platform/android/src/gson/json_primitive.cpp b/platform/android/src/gson/json_primitive.cpp
deleted file mode 100644
index 79d6b07617..0000000000
--- a/platform/android/src/gson/json_primitive.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-#include "json_primitive.hpp"
-
-namespace mbgl {
-namespace android {
-namespace gson {
-
-void JsonPrimitive::registerNative(jni::JNIEnv &env) {
-    jni::Class<JsonPrimitive>::Singleton(env);
-}
-
-} // namespace gson
-} // namespace android
-} // namespace mbgl
\ No newline at end of file
diff --git a/platform/android/src/gson/json_primitive.hpp b/platform/android/src/gson/json_primitive.hpp
deleted file mode 100644
index 36f138d902..0000000000
--- a/platform/android/src/gson/json_primitive.hpp
+++ /dev/null
@@ -1,21 +0,0 @@
-#pragma once
-
-#include "json_element.hpp"
-
-#include <jni/jni.hpp>
-
-namespace mbgl {
-namespace android {
-namespace gson {
-
-class JsonPrimitive {
-public:
-    using SuperTag = JsonElement;
-    static constexpr auto Name() { return "com/google/gson/JsonPrimitive"; };
-
-    static void registerNative(jni::JNIEnv&);
-};
-
-} // namespace gson
-} // namespace android
-} // namespace mbgl
\ No newline at end of file
diff --git a/platform/android/src/http_file_source.cpp b/platform/android/src/http_file_source.cpp
deleted file mode 100644
index 37f7307373..0000000000
--- a/platform/android/src/http_file_source.cpp
+++ /dev/null
@@ -1,195 +0,0 @@
-#include <mbgl/storage/http_file_source.hpp>
-#include <mbgl/storage/resource.hpp>
-#include <mbgl/storage/response.hpp>
-#include <mbgl/util/logging.hpp>
-
-#include <mbgl/util/async_request.hpp>
-#include <mbgl/util/async_task.hpp>
-#include <mbgl/util/http_header.hpp>
-#include <mbgl/util/string.hpp>
-#include <mbgl/util/util.hpp>
-
-#include <jni/jni.hpp>
-#include "attach_env.hpp"
-
-namespace mbgl {
-
-class HTTPFileSource::Impl {
-public:
-    android::UniqueEnv env { android::AttachEnv() };
-};
-
-class HTTPRequest : public AsyncRequest {
-public:
-    static constexpr auto Name() { return "com/mapbox/mapboxsdk/http/NativeHttpRequest"; };
-
-    HTTPRequest(jni::JNIEnv&, const Resource&, FileSource::Callback);
-    ~HTTPRequest();
-
-    void onFailure(jni::JNIEnv&, int type, const jni::String& message);
-    void onResponse(jni::JNIEnv&, int code,
-                    const jni::String& etag, const jni::String& modified,
-                    const jni::String& cacheControl, const jni::String& expires,
-                    const jni::String& retryAfter, const jni::String& xRateLimitReset,
-                    const jni::Array<jni::jbyte>& body);
-
-    jni::Global<jni::Object<HTTPRequest>> javaRequest;
-
-private:
-    Resource resource;
-    FileSource::Callback callback;
-    Response response;
-
-    util::AsyncTask async { [this] {
-        // Calling `callback` may result in deleting `this`. Copy data to temporaries first.
-        auto callback_ = callback;
-        auto response_ = response;
-        callback_(response_);
-    } };
-
-    static const int connectionError = 0;
-    static const int temporaryError = 1;
-    static const int permanentError = 2;
-};
-
-namespace android {
-
-void RegisterNativeHTTPRequest(jni::JNIEnv& env) {
-    static auto& javaClass = jni::Class<HTTPRequest>::Singleton(env);
-
-    #define METHOD(MethodPtr, name) jni::MakeNativePeerMethod<decltype(MethodPtr), (MethodPtr)>(name)
-
-    jni::RegisterNativePeer<HTTPRequest>(env, javaClass, "nativePtr",
-        METHOD(&HTTPRequest::onFailure, "nativeOnFailure"),
-        METHOD(&HTTPRequest::onResponse, "nativeOnResponse"));
-}
-
-} // namespace android
-
-HTTPRequest::HTTPRequest(jni::JNIEnv& env, const Resource& resource_, FileSource::Callback callback_)
-    : resource(resource_),
-      callback(callback_) {
-    std::string etagStr;
-    std::string modifiedStr;
-
-    if (resource.priorEtag) {
-        etagStr = *resource.priorEtag;
-    } else if (resource.priorModified) {
-        modifiedStr = util::rfc1123(*resource.priorModified);
-    }
-
-    jni::UniqueLocalFrame frame = jni::PushLocalFrame(env, 10);
-
-    static auto& javaClass = jni::Class<HTTPRequest>::Singleton(env);
-    static auto constructor =
-        javaClass.GetConstructor<jni::jlong, jni::String, jni::String, jni::String, jni::jboolean>(env);
-
-    javaRequest = jni::NewGlobal(env,
-        javaClass.New(env, constructor,
-            reinterpret_cast<jlong>(this),
-            jni::Make<jni::String>(env, resource.url),
-            jni::Make<jni::String>(env, etagStr),
-            jni::Make<jni::String>(env, modifiedStr),
-            (jboolean) (resource_.usage == Resource::Usage::Offline)
-        )
-    );
-}
-
-HTTPRequest::~HTTPRequest() {
-    android::UniqueEnv env = android::AttachEnv();
-
-    static auto& javaClass = jni::Class<HTTPRequest>::Singleton(*env);
-    static auto cancel = javaClass.GetMethod<void ()>(*env, "cancel");
-
-    javaRequest.Call(*env, cancel);
-}
-
-void HTTPRequest::onResponse(jni::JNIEnv& env, int code,
-                             const jni::String& etag, const jni::String& modified,
-                             const jni::String& cacheControl, const jni::String& expires,
-                             const jni::String& jRetryAfter, const jni::String& jXRateLimitReset,
-                             const jni::Array<jni::jbyte>& body) {
-
-    using Error = Response::Error;
-
-    if (etag) {
-        response.etag = jni::Make<std::string>(env, etag);
-    }
-
-    if (modified) {
-        response.modified = util::parseTimestamp(jni::Make<std::string>(env, modified).c_str());
-    }
-
-    if (cacheControl) {
-        const auto cc = http::CacheControl::parse(jni::Make<std::string>(env, cacheControl).c_str());
-        response.expires = cc.toTimePoint();
-        response.mustRevalidate = cc.mustRevalidate;
-    }
-
-    if (expires) {
-        response.expires = util::parseTimestamp(jni::Make<std::string>(env, expires).c_str());
-    }
-
-    if (code == 200) {
-        if (body) {
-            auto data = std::make_shared<std::string>(body.Length(env), char());
-            jni::GetArrayRegion(env, *body, 0, data->size(), reinterpret_cast<jbyte*>(&(*data)[0]));
-            response.data = data;
-        } else {
-            response.data = std::make_shared<std::string>();
-        }
-    } else if (code == 204 || (code == 404 && resource.kind == Resource::Kind::Tile)) {
-        response.noContent = true;
-    } else if (code == 304) {
-        response.notModified = true;
-    } else if (code == 404) {
-        response.error = std::make_unique<Error>(Error::Reason::NotFound, "HTTP status code 404");
-    } else if (code == 429) {
-        optional<std::string> retryAfter;
-        optional<std::string> xRateLimitReset;
-        if (jRetryAfter) {
-            retryAfter = jni::Make<std::string>(env, jRetryAfter);
-        }
-        if (jXRateLimitReset) {
-            xRateLimitReset = jni::Make<std::string>(env, jXRateLimitReset);
-        }
-        response.error = std::make_unique<Error>(Error::Reason::RateLimit, "HTTP status code 429", http::parseRetryHeaders(retryAfter, xRateLimitReset));
-    } else if (code >= 500 && code < 600) {
-        response.error = std::make_unique<Error>(Error::Reason::Server, std::string{ "HTTP status code " } + util::toString(code));
-    } else {
-        response.error = std::make_unique<Error>(Error::Reason::Other, std::string{ "HTTP status code " } + util::toString(code));
-    }
-
-    async.send();
-}
-
-void HTTPRequest::onFailure(jni::JNIEnv& env, int type, const jni::String& message) {
-    std::string messageStr = jni::Make<std::string>(env, message);
-
-    using Error = Response::Error;
-
-    switch (type) {
-        case connectionError:
-            response.error = std::make_unique<Error>(Error::Reason::Connection, messageStr);
-            break;
-        case temporaryError:
-            response.error = std::make_unique<Error>(Error::Reason::Server, messageStr);
-            break;
-        default:
-            response.error = std::make_unique<Error>(Error::Reason::Other, messageStr);
-    }
-
-    async.send();
-}
-
-HTTPFileSource::HTTPFileSource()
-    : impl(std::make_unique<Impl>()) {
-}
-
-HTTPFileSource::~HTTPFileSource() = default;
-
-std::unique_ptr<AsyncRequest> HTTPFileSource::request(const Resource& resource, Callback callback) {
-    return std::make_unique<HTTPRequest>(*impl->env, resource, callback);
-}
-
-} // namespace mbgl
diff --git a/platform/android/src/i18n/collator.cpp b/platform/android/src/i18n/collator.cpp
deleted file mode 100644
index 9136ee7b7c..0000000000
--- a/platform/android/src/i18n/collator.cpp
+++ /dev/null
@@ -1,192 +0,0 @@
-#include <mbgl/i18n/collator.hpp>
-#include <mbgl/text/language_tag.hpp>
-
-#include <jni/jni.hpp>
-
-#include "../attach_env.hpp"
-#include "collator_jni.hpp"
-
-namespace mbgl {
-namespace android {
-
-void Collator::registerNative(jni::JNIEnv& env) {
-    jni::Class<Collator>::Singleton(env);
-}
-
-jni::Local<jni::Object<Collator>> Collator::getInstance(jni::JNIEnv& env, const jni::Object<Locale>& locale) {
-    static auto& javaClass = jni::Class<Collator>::Singleton(env);
-    static auto method = javaClass.GetStaticMethod<jni::Object<Collator> (jni::Object<Locale>)>(env, "getInstance");
-    return javaClass.Call(env, method, locale);
-}
-
-void Collator::setStrength(jni::JNIEnv& env, const jni::Object<Collator>& collator, jni::jint strength) {
-    static auto& javaClass = jni::Class<Collator>::Singleton(env);
-    static auto method = javaClass.GetMethod<void (jni::jint)>(env, "setStrength");
-    collator.Call(env, method, strength);
-}
-
-jni::jint Collator::compare(jni::JNIEnv& env, const jni::Object<Collator>& collator, const jni::String& lhs, const jni::String& rhs) {
-    static auto& javaClass = jni::Class<Collator>::Singleton(env);
-    static auto method = javaClass.GetMethod<jni::jint (jni::String, jni::String)>(env, "compare");
-    return collator.Call(env, method, lhs, rhs);
-}
-
-void StringUtils::registerNative(jni::JNIEnv& env) {
-    jni::Class<StringUtils>::Singleton(env);
-}
-
-jni::Local<jni::String> StringUtils::unaccent(jni::JNIEnv& env, const jni::String& value) {
-    static auto& javaClass = jni::Class<StringUtils>::Singleton(env);
-    static auto method = javaClass.GetStaticMethod<jni::String (jni::String)>(env, "unaccent");
-    return javaClass.Call(env, method, value);
-}
-
-void Locale::registerNative(jni::JNIEnv& env) {
-    jni::Class<Locale>::Singleton(env);
-}
-
-/*
-We would prefer to use for/toLanguageTag, but they're only available in API level 21+
-
-jni::Object<Locale> Locale::forLanguageTag(jni::JNIEnv& env, jni::String languageTag) {
-    using Signature = jni::Object<Locale>(jni::String);
-    auto method = javaClass.GetStaticMethod<Signature>(env, "forLanguageTag");
-    return javaClass.Call(env, method, languageTag);
-}
-
-jni::String Locale::toLanguageTag(jni::JNIEnv& env, jni::Object<Locale> locale) {
-    using Signature = jni::String();
-    auto static method = javaClass.GetMethod<Signature>(env, "toLanguageTag");
-    return locale.Call(env, method);
-}
-*/
-
-jni::Local<jni::String> Locale::getLanguage(jni::JNIEnv& env, const jni::Object<Locale>& locale) {
-    static auto& javaClass = jni::Class<Locale>::Singleton(env);
-    static auto method = javaClass.GetMethod<jni::String ()>(env, "getLanguage");
-    return locale.Call(env, method);
-}
-
-jni::Local<jni::String> Locale::getCountry(jni::JNIEnv& env, const jni::Object<Locale>& locale) {
-    static auto& javaClass = jni::Class<Locale>::Singleton(env);
-    static auto method = javaClass.GetMethod<jni::String ()>(env, "getCountry");
-    return locale.Call(env, method);
-}
-
-jni::Local<jni::Object<Locale>> Locale::getDefault(jni::JNIEnv& env) {
-    static auto& javaClass = jni::Class<Locale>::Singleton(env);
-    static auto method = javaClass.GetStaticMethod<jni::Object<Locale> ()>(env, "getDefault");
-    return javaClass.Call(env, method);
-}
-
-jni::Local<jni::Object<Locale>> Locale::New(jni::JNIEnv& env, const jni::String& language) {
-    static auto& javaClass = jni::Class<Locale>::Singleton(env);
-    static auto constructor = javaClass.GetConstructor<jni::String>(env);
-    return javaClass.New(env, constructor, language);
-}
-
-jni::Local<jni::Object<Locale>> Locale::New(jni::JNIEnv& env, const jni::String& language, const jni::String& region) {
-    static auto& javaClass = jni::Class<Locale>::Singleton(env);
-    static auto constructor = javaClass.GetConstructor<jni::String, jni::String>(env);
-    return javaClass.New(env, constructor, language, region);
-}
-
-} // namespace android
-
-namespace platform {
-
-class Collator::Impl {
-public:
-    Impl(bool caseSensitive_, bool diacriticSensitive_, optional<std::string> locale_)
-        : caseSensitive(caseSensitive_)
-        , diacriticSensitive(diacriticSensitive_)
-        , env(android::AttachEnv())
-    {
-        LanguageTag languageTag = locale_ ? LanguageTag::fromBCP47(*locale_) : LanguageTag();
-        if (!languageTag.language) {
-            locale = jni::NewGlobal(*env,
-                android::Locale::getDefault(*env));
-        } else if (!languageTag.region) {
-            locale = jni::NewGlobal(*env,
-                android::Locale::New(*env, jni::Make<jni::String>(*env, *languageTag.language)));
-        } else {
-            locale = jni::NewGlobal(*env,
-                android::Locale::New(*env, jni::Make<jni::String>(*env, *languageTag.language),
-                                           jni::Make<jni::String>(*env, *languageTag.region)));
-        }
-        collator = jni::NewGlobal(*env, android::Collator::getInstance(*env, locale));
-        if (!diacriticSensitive && !caseSensitive) {
-            android::Collator::setStrength(*env, collator, 0 /*PRIMARY*/);
-        } else if (diacriticSensitive && !caseSensitive) {
-            android::Collator::setStrength(*env, collator, 1 /*SECONDARY*/);
-        } else if (caseSensitive) {
-            // If we're case-sensitive and diacritic-sensitive, we use a case-sensitive collator
-            // and a fallback implementation of diacritic-insensitivity.
-            android::Collator::setStrength(*env, collator, 2 /*TERTIARY*/);
-        }
-    }
-
-    bool operator==(const Impl& other) const {
-        return caseSensitive == other.caseSensitive &&
-                diacriticSensitive == other.diacriticSensitive &&
-                resolvedLocale() == other.resolvedLocale();
-    }
-
-    int compare(const std::string& lhs, const std::string& rhs) const {
-        bool useUnaccent = !diacriticSensitive && caseSensitive;
-        // java.text.Collator doesn't support a diacritic-insensitive/case-sensitive collation
-        // order, so we have to compromise here. We use Android's case-sensitive Collator
-        // against strings that have been "unaccented" using non-locale-aware nunicode logic.
-        // Because of the difference in locale-awareness, this means turning on case-sensitivity
-        // can _potentially_ change compare results for strings that don't actually have any case
-        // differences.
-        jni::Local<jni::String> jlhs = useUnaccent
-                                           ? android::StringUtils::unaccent(*env, jni::Make<jni::String>(*env, lhs))
-                                           : jni::Make<jni::String>(*env, lhs);
-        jni::Local<jni::String> jrhs = useUnaccent
-                                           ? android::StringUtils::unaccent(*env, jni::Make<jni::String>(*env, rhs))
-                                           : jni::Make<jni::String>(*env, rhs);
-
-        jni::jint result = android::Collator::compare(*env, collator, jlhs, jrhs);
-
-        return result;
-    }
-
-    std::string resolvedLocale() const {
-        std::string language = jni::Make<std::string>(*env, android::Locale::getLanguage(*env, locale));
-        std::string region = jni::Make<std::string>(*env, android::Locale::getCountry(*env, locale));
-
-        optional<std::string> resultLanguage;
-        if (!language.empty()) resultLanguage = language;
-        optional<std::string> resultRegion;
-        if (!region.empty()) resultRegion = region;
-
-        return LanguageTag(resultLanguage, {}, resultRegion).toBCP47();
-    }
-
-private:
-    bool caseSensitive;
-    bool diacriticSensitive;
-
-    android::UniqueEnv env;
-    jni::Global<jni::Object<android::Collator>> collator;
-    jni::Global<jni::Object<android::Locale>> locale;
-};
-
-Collator::Collator(bool caseSensitive, bool diacriticSensitive, const optional<std::string>& locale_)
-    : impl(std::make_shared<Impl>(caseSensitive, diacriticSensitive, locale_)) {}
-
-bool Collator::operator==(const Collator& other) const {
-    return *impl == *(other.impl);
-}
-
-int Collator::compare(const std::string& lhs, const std::string& rhs) const {
-    return impl->compare(lhs, rhs);
-}
-
-std::string Collator::resolvedLocale() const {
-    return impl->resolvedLocale();
-}
-
-} // namespace platform
-} // namespace mbgl
diff --git a/platform/android/src/i18n/collator_jni.hpp b/platform/android/src/i18n/collator_jni.hpp
deleted file mode 100644
index 612f9b49f3..0000000000
--- a/platform/android/src/i18n/collator_jni.hpp
+++ /dev/null
@@ -1,62 +0,0 @@
-#pragma once
-
-#include <jni/jni.hpp>
-
-/*
-    android::Collator and android::Locale are
-    the JNI wrappers of
-    java/text/Collator and java/util/Locale
-
-    mbgl::Collator is the portable interface
-    Both implementations are in collator.cpp
- */
-
-namespace mbgl {
-namespace android {
-
-class Locale {
-public:
-    static constexpr auto Name() { return "java/util/Locale"; };
-
-    /* Requires API level 21+ in order to support script/variant
-    static jni::Object<Locale> forLanguageTag(jni::JNIEnv&, jni::String);
-    static jni::String toLanguageTag(jni::JNIEnv&, jni::Object<Locale>);
-    */
-    static jni::Local<jni::Object<Locale>> getDefault(jni::JNIEnv&);
-    static jni::Local<jni::String> getLanguage(jni::JNIEnv&, const jni::Object<Locale>&);
-    static jni::Local<jni::String> getCountry(jni::JNIEnv&, const jni::Object<Locale>&);
-
-    static jni::Local<jni::Object<Locale>> New(jni::JNIEnv&, const jni::String&);
-    static jni::Local<jni::Object<Locale>> New(jni::JNIEnv&, const jni::String&, const jni::String&);
-
-
-    static void registerNative(jni::JNIEnv&);
-};
-
-class Collator {
-public:
-    static constexpr auto Name() { return "java/text/Collator"; };
-
-    static jni::Local<jni::Object<Collator>> getInstance(jni::JNIEnv&, const jni::Object<Locale>&);
-
-    static void setStrength(jni::JNIEnv&, const jni::Object<Collator>&, jni::jint);
-
-    static jni::jint compare(jni::JNIEnv&, const jni::Object<Collator>&, const jni::String&, const jni::String&);
-
-
-    static void registerNative(jni::JNIEnv&);
-};
-
-
-class StringUtils {
-public:
-    static constexpr auto Name() { return "com/mapbox/mapboxsdk/utils/StringUtils"; };
-
-    static jni::Local<jni::String> unaccent(jni::JNIEnv&, const jni::String&);
-
-
-    static void registerNative(jni::JNIEnv&);
-};
-
-} // namespace android
-} // namespace mbgl
diff --git a/platform/android/src/i18n/number_format.cpp b/platform/android/src/i18n/number_format.cpp
deleted file mode 100644
index c8e0b70562..0000000000
--- a/platform/android/src/i18n/number_format.cpp
+++ /dev/null
@@ -1,80 +0,0 @@
-#include <mbgl/i18n/number_format.hpp>
-#include <mbgl/text/language_tag.hpp>
-
-#include <jni/jni.hpp>
-
-#include "../attach_env.hpp"
-#include "number_format_jni.hpp"
-
-namespace mbgl {
-namespace android {
-
-void NumberFormat::registerNative(jni::JNIEnv& env) {
-    jni::Class<NumberFormat>::Singleton(env);
-}
-
-jni::Local<jni::Object<NumberFormat>> NumberFormat::getInstance(jni::JNIEnv& env, const jni::Object<Locale>& locale) {
-    static auto& javaClass = jni::Class<NumberFormat>::Singleton(env);
-    static auto method = javaClass.GetStaticMethod<jni::Object<NumberFormat> (jni::Object<Locale>)>(env, "getInstance");
-    return javaClass.Call(env, method, locale);
-}
-
-jni::Local<jni::Object<NumberFormat>> NumberFormat::getCurrencyInstance(jni::JNIEnv& env, const jni::Object<Locale>& locale) {
-    static auto& javaClass = jni::Class<NumberFormat>::Singleton(env);
-    static auto method = javaClass.GetStaticMethod<jni::Object<NumberFormat> (jni::Object<Locale>)>(env, "getCurrencyInstance");
-    return javaClass.Call(env, method, locale);
-}
-
-jni::Local<jni::String> NumberFormat::format(jni::JNIEnv& env, const jni::Object<NumberFormat>& nf, jni::jdouble number) {
-    static auto& javaClass = jni::Class<NumberFormat>::Singleton(env);
-    static auto method = javaClass.GetMethod<jni::String (jni::jdouble)>(env, "format");
-    return nf.Call(env, method, number);
-}
-
-void NumberFormat::setMinimumFractionDigits(jni::JNIEnv& env, const jni::Object<NumberFormat>& nf, jni::jint value) {
-    static auto& javaClass = jni::Class<NumberFormat>::Singleton(env);
-    static auto method = javaClass.GetMethod<void (jni::jint)>(env, "setMinimumFractionDigits");
-    return nf.Call(env, method, value);
-}
-
-void NumberFormat::setMaximumFractionDigits(jni::JNIEnv& env, const jni::Object<NumberFormat>& nf, jni::jint value) {
-    static auto& javaClass = jni::Class<NumberFormat>::Singleton(env);
-    static auto method = javaClass.GetMethod<void (jni::jint)>(env, "setMaximumFractionDigits");
-    return nf.Call(env, method, value);
-}
-
-} // namespace android
-
-namespace platform {
-
-std::string formatNumber(double number, const std::string& localeId, const std::string& currency,
-                         uint8_t minFractionDigits, uint8_t maxFractionDigits) {
-
-    auto env{ android::AttachEnv() };
-
-    jni::Global<jni::Object<android::Locale>> locale;
-    LanguageTag languageTag = !localeId.empty() ? LanguageTag::fromBCP47(localeId) : LanguageTag();
-    if (!languageTag.language) {
-        locale = jni::NewGlobal(*env, android::Locale::getDefault(*env));
-    } else if (!languageTag.region) {
-        locale = jni::NewGlobal(*env, android::Locale::New(*env, jni::Make<jni::String>(*env, *languageTag.language)));
-    } else {
-        locale = jni::NewGlobal(*env, android::Locale::New(*env, jni::Make<jni::String>(*env, *languageTag.language),
-                                                                 jni::Make<jni::String>(*env, *languageTag.region)));
-    }
-
-    jni::Global<jni::Object<android::NumberFormat>> formatter;
-    if (currency.empty()) {
-        formatter = jni::NewGlobal(*env, android::NumberFormat::getInstance(*env, locale));
-        android::NumberFormat::setMinimumFractionDigits(*env, formatter, static_cast<jni::jint>(minFractionDigits));
-        android::NumberFormat::setMaximumFractionDigits(*env, formatter, static_cast<jni::jint>(maxFractionDigits));
-    } else {
-        formatter = jni::NewGlobal(*env, android::NumberFormat::getCurrencyInstance(*env, locale));
-    }
-
-    auto result = android::NumberFormat::format(*env, formatter, static_cast<jni::jdouble>(number));
-    return jni::Make<std::string>(*env, result);
-}
-
-} // namespace platform
-} // namespace mbgl
diff --git a/platform/android/src/i18n/number_format_jni.hpp b/platform/android/src/i18n/number_format_jni.hpp
deleted file mode 100644
index 1720038925..0000000000
--- a/platform/android/src/i18n/number_format_jni.hpp
+++ /dev/null
@@ -1,29 +0,0 @@
-#pragma once
-
-#include <jni/jni.hpp>
-
-#include "collator_jni.hpp"
-
-/*
-    android::NumberFormat is the JNI wrapper
-    of java/text/NumberFormat.
- */
-
-namespace mbgl {
-namespace android {
-
-class NumberFormat {
-public:
-    static constexpr auto Name() { return "java/text/NumberFormat"; };
-
-    static jni::Local<jni::Object<NumberFormat>> getInstance(jni::JNIEnv&, const jni::Object<Locale>&);
-    static jni::Local<jni::Object<NumberFormat>> getCurrencyInstance(jni::JNIEnv&, const jni::Object<Locale>&);
-    static jni::Local<jni::String> format(jni::JNIEnv&, const jni::Object<NumberFormat>&, jni::jdouble);
-    static void setMinimumFractionDigits(jni::JNIEnv&, const jni::Object<NumberFormat>&, jni::jint);
-    static void setMaximumFractionDigits(jni::JNIEnv&, const jni::Object<NumberFormat>&, jni::jint);
-
-    static void registerNative(jni::JNIEnv&);
-};
-
-} // namespace android
-} // namespace mbgl
diff --git a/platform/android/src/java/util.cpp b/platform/android/src/java/util.cpp
deleted file mode 100644
index b3aebb36cc..0000000000
--- a/platform/android/src/java/util.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
-#include "util.hpp"
-
-namespace mbgl {
-namespace android {
-namespace java {
-namespace util {
-
-void registerNative(jni::JNIEnv& env) {
-    jni::Class<Arrays>::Singleton(env);
-    jni::Class<List>::Singleton(env);
-    jni::Class<Set>::Singleton(env);
-    jni::Class<Map>::Singleton(env);
-    jni::Class<Map::Entry>::Singleton(env);
-}
-
-} // namespace util
-} // namespace java
-} // namespace android
-} // namespace mbgl
\ No newline at end of file
diff --git a/platform/android/src/java/util.hpp b/platform/android/src/java/util.hpp
deleted file mode 100644
index 9b0c01459e..0000000000
--- a/platform/android/src/java/util.hpp
+++ /dev/null
@@ -1,81 +0,0 @@
-#pragma once
-
-#include <mbgl/util/noncopyable.hpp>
-
-#include <jni/jni.hpp>
-
-namespace mbgl {
-namespace android {
-namespace java {
-namespace util {
-
-class List : private mbgl::util::noncopyable {
-public:
-    static constexpr auto Name() { return "java/util/List"; };
-
-    template<class T>
-    static jni::Local<jni::Array<jni::Object<T>>> toArray(jni::JNIEnv& env, const jni::Object<List>& list) {
-        static auto& javaClass = jni::Class<List>::Singleton(env);
-        static auto toArray = javaClass.GetMethod<jni::Array<jni::Object<>> ()>(env, "toArray");
-
-        return jni::Local<jni::Array<jni::Object<T>>>(env, list.Call(env, toArray).release());
-    };
-};
-
-class Arrays : private mbgl::util::noncopyable {
-public:
-    static constexpr auto Name() { return "java/util/Arrays"; };
-
-    template <class T>
-    static jni::Local<jni::Object<List>> asList(jni::JNIEnv& env, const jni::Array<jni::Object<T>>& array) {
-        static auto& javaClass = jni::Class<Arrays>::Singleton(env);
-        static auto asList = javaClass.GetStaticMethod<jni::Object<List>(jni::Array<jni::Object<>>)>(env, "asList");
-
-        auto typeErasedArray = jni::Local<jni::Array<jni::Object<>>>(env, jni::NewLocal(env, array).release());
-        return javaClass.Call(env, asList, typeErasedArray);
-    }
-};
-
-class Set : private mbgl::util::noncopyable {
-public:
-    static constexpr auto Name() { return "java/util/Set"; };
-
-    template<class T>
-    static jni::Local<jni::Array<jni::Object<T>>> toArray(jni::JNIEnv& env, const jni::Object<Set>& list) {
-        static auto& javaClass = jni::Class<Set>::Singleton(env);
-        static auto toArray = javaClass.GetMethod<jni::Array<jni::Object<>> ()>(env, "toArray");
-
-        return jni::Local<jni::Array<jni::Object<T>>>(env, list.Call(env, toArray).release());
-    };
-};
-
-class Map : private mbgl::util::noncopyable {
-public:
-    static constexpr auto Name() { return "java/util/Map"; };
-
-    class Entry : private mbgl::util::noncopyable {
-    public:
-        static constexpr auto Name() { return "java/util/Map$Entry"; };
-
-        template <class T>
-        static jni::Local<jni::Object<T>> getKey(jni::JNIEnv& env, const jni::Object<Entry>& entry) {
-            static auto& javaClass = jni::Class<Map::Entry>::Singleton(env);
-            static auto method = javaClass.GetMethod<jni::Object<> ()>(env, "getKey");
-            return jni::Cast(env, jni::Class<T>::Singleton(env), entry.Call(env, method));
-        }
-
-        template <class T>
-        static jni::Local<jni::Object<T>> getValue(jni::JNIEnv& env, const jni::Object<Entry>& entry) {
-            static auto& javaClass = jni::Class<Map::Entry>::Singleton(env);
-            static auto method = javaClass.GetMethod<jni::Object<> ()>(env, "getValue");
-            return jni::Cast(env, jni::Class<T>::Singleton(env), entry.Call(env, method));
-        }
-    };
-};
-
-void registerNative(jni::JNIEnv&);
-
-} // namespace util
-} // namespace java
-} // namespace android
-} // namespace mbgl
\ No newline at end of file
diff --git a/platform/android/src/java_types.cpp b/platform/android/src/java_types.cpp
deleted file mode 100644
index 7a1ba93a58..0000000000
--- a/platform/android/src/java_types.cpp
+++ /dev/null
@@ -1,49 +0,0 @@
-#include "java_types.hpp"
-
-namespace mbgl {
-namespace android {
-namespace java {
-
-    jni::jclass* ObjectArray::jclass;
-
-    jni::jclass* String::jclass;
-
-    jni::jclass* Boolean::jclass;
-    jni::jmethodID* Boolean::booleanValueMethodId;
-
-    jni::jclass* Number::jclass;
-    jni::jmethodID* Number::floatValueMethodId;
-    jni::jmethodID* Number::doubleValueMethodId;
-    jni::jmethodID* Number::longValueMethodId;
-
-    jni::jclass* Map::jclass;
-    jni::jmethodID* Map::getMethodId;
-    jni::jmethodID* Map::keySetMethodId;
-
-    jni::jclass* Set::jclass;
-    jni::jmethodID* Set::toArrayMethodId;
-
-    void registerNatives(JNIEnv& env) {
-        ObjectArray::jclass = jni::NewGlobalRef(env, &jni::FindClass(env, "[Ljava/lang/Object;")).release();
-
-        String::jclass = jni::NewGlobalRef(env, &jni::FindClass(env, "java/lang/String")).release();
-
-        Boolean::jclass = jni::NewGlobalRef(env, &jni::FindClass(env, "java/lang/Boolean")).release();
-        Boolean::booleanValueMethodId = &jni::GetMethodID(env, *Boolean::jclass, "booleanValue", "()Z");
-
-        Number::jclass = jni::NewGlobalRef(env, &jni::FindClass(env, "java/lang/Number")).release();
-        Number::floatValueMethodId = &jni::GetMethodID(env, *Number::jclass, "floatValue", "()F");
-        Number::doubleValueMethodId = &jni::GetMethodID(env, *Number::jclass, "doubleValue", "()D");
-        Number::longValueMethodId = &jni::GetMethodID(env, *Number::jclass, "longValue", "()J");
-
-        Map::jclass = jni::NewGlobalRef(env, &jni::FindClass(env, "java/util/Map")).release();
-        Map::getMethodId = &jni::GetMethodID(env, *Map::jclass, "get", "(Ljava/lang/Object;)Ljava/lang/Object;");
-        Map::keySetMethodId = &jni::GetMethodID(env, *Map::jclass, "keySet", "()Ljava/util/Set;");
-
-        Set::jclass = jni::NewGlobalRef(env, &jni::FindClass(env, "java/util/Set")).release();
-        Set::toArrayMethodId = &jni::GetMethodID(env, *Set::jclass, "toArray", "()[Ljava/lang/Object;");
-    }
-
-}
-}
-}
diff --git a/platform/android/src/java_types.hpp b/platform/android/src/java_types.hpp
deleted file mode 100644
index c7c93ce71b..0000000000
--- a/platform/android/src/java_types.hpp
+++ /dev/null
@@ -1,43 +0,0 @@
-#pragma once
-
-#include <jni/jni.hpp>
-
-namespace mbgl {
-namespace android {
-namespace java {
-
-    struct ObjectArray {
-        static jni::jclass* jclass;
-    };
-
-    struct String {
-        static jni::jclass* jclass;
-    };
-
-    struct Boolean {
-        static jni::jclass* jclass;
-        static jni::jmethodID* booleanValueMethodId;
-    };
-
-    struct Number {
-        static jni::jclass* jclass;
-        static jni::jmethodID* floatValueMethodId;
-        static jni::jmethodID* doubleValueMethodId;
-        static jni::jmethodID* longValueMethodId;
-    };
-
-    struct Map {
-        static jni::jclass* jclass;
-        static jni::jmethodID* getMethodId;
-        static jni::jmethodID* keySetMethodId;
-    };
-
-    struct Set {
-        static jni::jclass* jclass;
-        static jni::jmethodID* toArrayMethodId;
-    };
-
-    void registerNatives(JNIEnv&);
-}
-}
-}
diff --git a/platform/android/src/jni_native.cpp b/platform/android/src/jni_native.cpp
deleted file mode 100644
index d6b03d981e..0000000000
--- a/platform/android/src/jni_native.cpp
+++ /dev/null
@@ -1,168 +0,0 @@
-#include "jni_native.hpp"
-
-#include "annotation/marker.hpp"
-#include "annotation/polygon.hpp"
-#include "annotation/polyline.hpp"
-#include "bitmap.hpp"
-#include "bitmap_factory.hpp"
-#include "connectivity_listener.hpp"
-#include "conversion/collection.hpp"
-#include "conversion/conversion.hpp"
-#include "file_source.hpp"
-#include "geojson/feature.hpp"
-#include "geojson/feature_collection.hpp"
-#include "geojson/geometry.hpp"
-#include "geojson/geometry_collection.hpp"
-#include "geojson/line_string.hpp"
-#include "geojson/multi_line_string.hpp"
-#include "geojson/multi_point.hpp"
-#include "geojson/multi_polygon.hpp"
-#include "geojson/point.hpp"
-#include "geojson/polygon.hpp"
-#include "geometry/lat_lng.hpp"
-#include "geometry/lat_lng_bounds.hpp"
-#include "geometry/lat_lng_quad.hpp"
-#include "geometry/projected_meters.hpp"
-#include "graphics/pointf.hpp"
-#include "graphics/rectf.hpp"
-#include "gson/json_array.hpp"
-#include "gson/json_element.hpp"
-#include "gson/json_object.hpp"
-#include "gson/json_primitive.hpp"
-#include "java_types.hpp"
-#include "map_renderer.hpp"
-#include "map_renderer_runnable.hpp"
-#include "mapbox.hpp"
-#include "native_map_view.hpp"
-#ifndef MBGL_MODULE_OFFLINE_DISABLE
-#include "offline/offline_manager.hpp"
-#include "offline/offline_region.hpp"
-#include "offline/offline_region_definition.hpp"
-#include "offline/offline_region_error.hpp"
-#include "offline/offline_region_status.hpp"
-#endif
-#include "style/transition_options.hpp"
-#include "style/layers/layer_manager.hpp"
-#include "style/sources/source.hpp"
-#include "style/light.hpp"
-#include "style/formatted.hpp"
-#include "style/formatted_section.hpp"
-#ifndef MBGL_MODULE_SNAPSHOT_DISABLE
-#include "snapshotter/map_snapshotter.hpp"
-#include "snapshotter/map_snapshot.hpp"
-#endif
-#include "i18n/collator_jni.hpp"
-#include "i18n/number_format_jni.hpp"
-#include "logger.hpp"
-#include "text/local_glyph_rasterizer_jni.hpp"
-
-namespace mbgl {
-namespace android {
-
-void RegisterNativeHTTPRequest(JNIEnv&);
-
-void registerNatives(JavaVM *vm) {
-    theJVM = vm;
-
-    jni::JNIEnv& env = jni::GetEnv(*vm, jni::jni_version_1_6);
-
-    // For the FileSource
-    static mbgl::util::RunLoop mainRunLoop;
-    FileSource::registerNative(env);
-
-    // Basic types
-    java::registerNatives(env);
-    java::util::registerNative(env);
-    PointF::registerNative(env);
-    RectF::registerNative(env);
-
-    // GeoJSON
-    geojson::Feature::registerNative(env);
-    geojson::FeatureCollection::registerNative(env);
-    geojson::Geometry::registerNative(env);
-    geojson::GeometryCollection::registerNative(env);
-    geojson::LineString::registerNative(env);
-    geojson::MultiLineString::registerNative(env);
-    geojson::MultiPoint::registerNative(env);
-    geojson::MultiPolygon::registerNative(env);
-    geojson::Point::registerNative(env);
-    geojson::Polygon::registerNative(env);
-
-    // Geometry
-    LatLng::registerNative(env);
-    LatLngBounds::registerNative(env);
-    LatLngQuad::registerNative(env);
-    ProjectedMeters::registerNative(env);
-
-    // GSon
-    gson::JsonArray::registerNative(env);
-    gson::JsonElement::registerNative(env);
-    gson::JsonObject::registerNative(env);
-    gson::JsonPrimitive::registerNative(env);
-
-    //Annotation
-    Marker::registerNative(env);
-    Polygon::registerNative(env);
-    Polyline::registerNative(env);
-
-    // Map
-    MapRenderer::registerNative(env);
-    MapRendererRunnable::registerNative(env);
-    NativeMapView::registerNative(env);
-
-    // Http
-    RegisterNativeHTTPRequest(env);
-
-    // Bitmap
-    Bitmap::registerNative(env);
-    BitmapFactory::registerNative(env);
-
-    // Style
-    TransitionOptions::registerNative(env);
-    LayerManagerAndroid::get()->registerNative(env);
-    Source::registerNative(env);
-    Light::registerNative(env);
-    Position::registerNative(env);
-    Formatted::registerNative(env);
-    FormattedSection::registerNative(env);
-
-    // Map
-    CameraPosition::registerNative(env);
-    Image::registerNative(env);
-
-    // Connectivity
-    ConnectivityListener::registerNative(env);
-
-    // Offline
-#ifndef MBGL_MODULE_OFFLINE_DISABLE
-    OfflineManager::registerNative(env);
-    OfflineRegion::registerNative(env);
-    OfflineRegionDefinition::registerNative(env);
-    OfflineTilePyramidRegionDefinition::registerNative(env);
-    OfflineGeometryRegionDefinition::registerNative(env);
-    OfflineRegionError::registerNative(env);
-    OfflineRegionStatus::registerNative(env);
-#endif
-
-    // Snapshotter
-#ifndef MBGL_MODULE_SNAPSHOT_DISABLE
-    MapSnapshotter::registerNative(env);
-    MapSnapshot::registerNative(env);
-#endif
-
-    // text
-    LocalGlyphRasterizer::registerNative(env);
-    Locale::registerNative(env);
-    Collator::registerNative(env);
-    StringUtils::registerNative(env);
-    NumberFormat::registerNative(env);
-
-    // Logger
-    Logger::registerNative(env);
-
-    // AssetManager
-    Mapbox::registerNative(env);
-}
-
-} // namespace android
-} // namespace mbgl
diff --git a/platform/android/src/jni_native.hpp b/platform/android/src/jni_native.hpp
deleted file mode 100644
index 1cc9a7e81b..0000000000
--- a/platform/android/src/jni_native.hpp
+++ /dev/null
@@ -1,13 +0,0 @@
-#pragma once
-
-#include <mbgl/util/util.hpp>
-
-#include "jni.hpp"
-
-namespace mbgl {
-namespace android {
-
-MBGL_EXPORT void registerNatives(JavaVM* vm);
-
-} // namespace android
-} // namespace mbgl
diff --git a/platform/android/src/logger.cpp b/platform/android/src/logger.cpp
deleted file mode 100644
index f5d78cc83c..0000000000
--- a/platform/android/src/logger.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-#include "logger.hpp"
-#include "java_types.hpp"
-
-namespace mbgl {
-namespace android {
-
-void Logger::registerNative(jni::JNIEnv& env) {
-    jni::Class<Logger>::Singleton(env);
-}
-
-void Logger::log(jni::JNIEnv& env, EventSeverity severity, const std::string &msg) {
-    static auto& _class = jni::Class<Logger>::Singleton(env);
-
-    auto tag = jni::Make<jni::String>(env, "Mbgl");
-    auto message = jni::Make<jni::String>(env, msg);
-    using Signature = void(jni::String, jni::String);
-
-    if (severity == EventSeverity::Debug) {
-        auto static debug = _class.GetStaticMethod<Signature>(env, "d");
-        _class.Call(env, debug, tag, message);
-    } else if (severity == EventSeverity::Info) {
-        auto static info = _class.GetStaticMethod<Signature>(env, "i");
-        _class.Call(env, info, tag, message);
-    } else if(severity == EventSeverity::Warning) {
-        auto static warning = _class.GetStaticMethod<Signature>(env, "w");
-        _class.Call(env, warning, tag, message);
-    } else {
-        auto static error = _class.GetStaticMethod<Signature>(env, "e");
-        _class.Call(env, error, tag, message);
-    }
-}
-
-} // namespace android
-} // namespace mbgl
\ No newline at end of file
diff --git a/platform/android/src/logger.hpp b/platform/android/src/logger.hpp
deleted file mode 100644
index 7481ecb265..0000000000
--- a/platform/android/src/logger.hpp
+++ /dev/null
@@ -1,21 +0,0 @@
-#pragma once
-
-#include <mbgl/util/event.hpp>
-#include <jni/jni.hpp>
-#include "bitmap.hpp"
-
-namespace mbgl {
-namespace android {
-
-class Logger {
-public:
-   static constexpr auto Name() {
-       return "com/mapbox/mapboxsdk/log/Logger";
-   };
-   static void registerNative(jni::JNIEnv&);
-
-   static void log(jni::JNIEnv&, EventSeverity severity, const std::string &msg);
-};
-
-} // namespace android
-} // namespace mbgl
\ No newline at end of file
diff --git a/platform/android/src/logging_android.cpp b/platform/android/src/logging_android.cpp
deleted file mode 100644
index 1301367280..0000000000
--- a/platform/android/src/logging_android.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-#include <mbgl/util/logging.hpp>
-
-#include "logger.hpp"
-#include "attach_env.hpp"
-
-namespace mbgl {
-
-void Log::platformRecord(EventSeverity severity, const std::string &msg) {
-    auto env{ android::AttachEnv() };
-    android::Logger::log(*env, severity, msg);
-}
-
-}
\ No newline at end of file
diff --git a/platform/android/src/main.cpp b/platform/android/src/main.cpp
deleted file mode 100644
index 9b5c6c1974..0000000000
--- a/platform/android/src/main.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
-#include "jni.hpp"
-#include "jni_native.hpp"
-#include <jni/jni.hpp>
-
-extern "C" JNIEXPORT jint JNI_OnLoad(JavaVM *vm, void *) {
-    assert(vm != nullptr);
-    mbgl::android::registerNatives(vm);
-    return JNI_VERSION_1_6;
-}
diff --git a/platform/android/src/map/camera_position.cpp b/platform/android/src/map/camera_position.cpp
deleted file mode 100644
index 4266b64fdf..0000000000
--- a/platform/android/src/map/camera_position.cpp
+++ /dev/null
@@ -1,69 +0,0 @@
-#include "camera_position.hpp"
-#include "../geometry/lat_lng.hpp"
-
-namespace mbgl {
-namespace android {
-
-jni::Local<jni::Object<CameraPosition>> CameraPosition::New(jni::JNIEnv &env, mbgl::CameraOptions options, float pixelRatio) {
-    static auto& javaClass = jni::Class<CameraPosition>::Singleton(env);
-    static auto constructor = javaClass.GetConstructor<jni::Object<LatLng>, double, double, double, jni::Array<jni::jdouble>>(env);
-
-    // wrap LatLng values coming from core
-    auto center = options.center.value();
-    center.wrap();
-
-    // convert bearing, measured in radians counterclockwise from true north.
-    // Wrapped to [−π rad, π rad). Android binding from 0 to 360 degrees
-    double bearing_degrees = options.bearing.value_or(0);
-    while (bearing_degrees > 360) {
-        bearing_degrees -= 360;
-    }
-    while (bearing_degrees < 0) {
-        bearing_degrees += 360;
-    }
-
-    // convert tilt, core ranges from  [0 rad, 1,0472 rad], android ranges from 0 to 60
-    double tilt_degrees = options.pitch.value_or(0);
-
-    std::vector<jdouble> paddingVect;
-    auto insets = options.padding.value_or(EdgeInsets {0, 0, 0, 0});
-    auto padding = jni::Array<jni::jdouble>::New(env, 4);
-    paddingVect.push_back(insets.left() * pixelRatio);
-    paddingVect.push_back(insets.top() * pixelRatio);
-    paddingVect.push_back(insets.right() * pixelRatio);
-    paddingVect.push_back(insets.bottom() * pixelRatio);
-    padding.SetRegion<std::vector<jni::jdouble>>(env, 0, paddingVect);
-
-    return javaClass.New(env, constructor, LatLng::New(env, center), options.zoom.value_or(0), tilt_degrees, bearing_degrees, padding);
-}
-
-mbgl::CameraOptions CameraPosition::getCameraOptions(jni::JNIEnv& env, const jni::Object<CameraPosition>& position, float pixelRatio) {
-    static auto& javaClass = jni::Class<CameraPosition>::Singleton(env);
-    static auto bearing = javaClass.GetField<jni::jdouble>(env, "bearing");
-    static auto target = javaClass.GetField<jni::Object<LatLng>>(env, "target");
-    static auto tilt = javaClass.GetField<jni::jdouble>(env, "tilt");
-    static auto zoom = javaClass.GetField<jni::jdouble>(env, "zoom");
-    static auto paddingField = javaClass.GetField<jni::Array<jni::jdouble>>(env, "padding");
-
-    auto padding = position.Get(env, paddingField);
-    auto center = LatLng::getLatLng(env, position.Get(env, target));
-
-    return mbgl::CameraOptions{center,
-                               padding && padding.Length(env) == 4 ? EdgeInsets{padding.Get(env, 1) * pixelRatio,
-                                                                                padding.Get(env, 0) * pixelRatio,
-                                                                                padding.Get(env, 3) * pixelRatio,
-                                                                                padding.Get(env, 2) * pixelRatio}
-                                                                   : (EdgeInsets){},
-                               {},
-                               position.Get(env, zoom),
-                               position.Get(env, bearing),
-                               position.Get(env, tilt)};
-}
-
-void CameraPosition::registerNative(jni::JNIEnv &env) {
-    jni::Class<CameraPosition>::Singleton(env);
-}
-
-} // namespace android
-} // namespace mb
-
diff --git a/platform/android/src/map/camera_position.hpp b/platform/android/src/map/camera_position.hpp
deleted file mode 100644
index b677f04ea0..0000000000
--- a/platform/android/src/map/camera_position.hpp
+++ /dev/null
@@ -1,23 +0,0 @@
-#pragma once
-
-#include <mbgl/util/noncopyable.hpp>
-#include <mbgl/map/camera.hpp>
-
-#include <jni/jni.hpp>
-
-namespace mbgl {
-namespace android {
-
-class CameraPosition : private mbgl::util::noncopyable {
-public:
-    static constexpr auto Name() { return "com/mapbox/mapboxsdk/camera/CameraPosition"; };
-
-    static jni::Local<jni::Object<CameraPosition>> New(jni::JNIEnv&, mbgl::CameraOptions, float pixelRatio);
-
-    static mbgl::CameraOptions getCameraOptions(jni::JNIEnv&, const jni::Object<CameraPosition>&, float pixelRatio);
-
-    static void registerNative(jni::JNIEnv&);
-};
-
-} // namespace android
-} // namespace mbgl
\ No newline at end of file
diff --git a/platform/android/src/map/image.cpp b/platform/android/src/map/image.cpp
deleted file mode 100644
index 10c32d2577..0000000000
--- a/platform/android/src/map/image.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
-#include <mbgl/style/image.hpp>
-#include <mbgl/util/exception.hpp>
-#include "image.hpp"
-
-namespace mbgl {
-namespace android {
-
-mbgl::style::Image Image::getImage(jni::JNIEnv& env, const jni::Object<Image>& image) {
-    static auto& javaClass = jni::Class<Image>::Singleton(env);
-    static auto widthField = javaClass.GetField<jni::jint>(env, "width");
-    static auto heightField = javaClass.GetField<jni::jint>(env, "height");
-    static auto pixelRatioField = javaClass.GetField<jni::jfloat>(env, "pixelRatio");
-    static auto bufferField = javaClass.GetField<jni::Array<jbyte>>(env, "buffer");
-    static auto nameField = javaClass.GetField<jni::String>(env, "name");
-    static auto sdfField = javaClass.GetField<jni::jboolean>(env, "sdf");
-
-    auto height = image.Get(env, heightField);
-    auto width = image.Get(env, widthField);
-    auto pixelRatio = image.Get(env, pixelRatioField);
-    auto pixels = image.Get(env, bufferField);
-    auto name = jni::Make<std::string>(env, image.Get(env, nameField));
-    auto sdf = (bool) image.Get(env, sdfField);
-
-    jni::NullCheck(env, pixels.get());
-    std::size_t size = pixels.Length(env);
-
-    mbgl::PremultipliedImage premultipliedImage({ static_cast<uint32_t>(width), static_cast<uint32_t>(height) });
-    if (premultipliedImage.bytes() != uint32_t(size)) {
-        throw mbgl::util::StyleImageException("Image pixel count mismatch");
-    }
-
-    jni::GetArrayRegion(env, *pixels, 0, size, reinterpret_cast<jbyte*>(premultipliedImage.data.get()));
-    return mbgl::style::Image {name, std::move(premultipliedImage), pixelRatio, sdf};
-}
-
-void Image::registerNative(jni::JNIEnv &env) {
-    jni::Class<Image>::Singleton(env);
-}
-
-} // namespace android
-} // namespace mb
diff --git a/platform/android/src/map/image.hpp b/platform/android/src/map/image.hpp
deleted file mode 100644
index 7549bc646a..0000000000
--- a/platform/android/src/map/image.hpp
+++ /dev/null
@@ -1,21 +0,0 @@
-#pragma once
-
-#include <mbgl/util/noncopyable.hpp>
-
-#include <jni/jni.hpp>
-#include <mbgl/style/image.hpp>
-
-namespace mbgl {
-namespace android {
-
-class Image : private mbgl::util::noncopyable {
-public:
-    static constexpr auto Name() { return "com/mapbox/mapboxsdk/maps/Image"; };
-
-    static mbgl::style::Image getImage(jni::JNIEnv&, const jni::Object<Image>&);
-
-    static void registerNative(jni::JNIEnv&);
-};
-
-} // namespace android
-} // namespace mbgl
\ No newline at end of file
diff --git a/platform/android/src/map_renderer.cpp b/platform/android/src/map_renderer.cpp
deleted file mode 100644
index 3ebbdb7e5e..0000000000
--- a/platform/android/src/map_renderer.cpp
+++ /dev/null
@@ -1,247 +0,0 @@
-#include "map_renderer.hpp"
-
-#include <mbgl/renderer/renderer.hpp>
-#include <mbgl/gfx/backend_scope.hpp>
-#include <mbgl/util/run_loop.hpp>
-
-#include <string>
-
-#include "attach_env.hpp"
-#include "android_renderer_backend.hpp"
-#include "map_renderer_runnable.hpp"
-
-namespace mbgl {
-namespace android {
-
-MapRenderer::MapRenderer(jni::JNIEnv& _env,
-                         const jni::Object<MapRenderer>& obj,
-                         jni::jfloat pixelRatio_,
-                         const jni::String& localIdeographFontFamily_)
-    : javaPeer(_env, obj),
-      pixelRatio(pixelRatio_),
-      localIdeographFontFamily(localIdeographFontFamily_ ? jni::Make<std::string>(_env, localIdeographFontFamily_)
-                                                         : optional<std::string>{}),
-      mailboxData(this) {}
-
-MapRenderer::MailboxData::MailboxData(Scheduler* scheduler_) : scheduler(scheduler_) {
-    assert(scheduler);
-}
-
-std::shared_ptr<Mailbox> MapRenderer::MailboxData::getMailbox() const noexcept {
-    if (!mailbox) {
-        mailbox = std::make_shared<Mailbox>(*scheduler);
-    }
-    return mailbox;
-}
-
-MapRenderer::~MapRenderer() = default;
-
-void MapRenderer::reset() {
-    destroyed = true;
-
-    if (renderer) {
-        // Make sure to destroy the renderer on the GL Thread
-        auto self = ActorRef<MapRenderer>(*this, mailboxData.getMailbox());
-        self.ask(&MapRenderer::resetRenderer).wait();
-    }
-
-    // Lock to make sure there is no concurrent initialisation on the gl thread
-    std::lock_guard<std::mutex> lock(initialisationMutex);
-    rendererObserver.reset();
-}
-
-ActorRef<Renderer> MapRenderer::actor() const {
-    return *rendererRef;
-}
-
-void MapRenderer::schedule(std::function<void()> scheduled) {
-    // Create a runnable
-    android::UniqueEnv _env = android::AttachEnv();
-    auto runnable = std::make_unique<MapRendererRunnable>(*_env, std::move(scheduled));
-
-    // Obtain ownership of the peer (gets transferred to the MapRenderer on the JVM for later GC)
-    auto peer = runnable->peer();
-
-    // Queue the event on the Java Peer
-    static auto& javaClass = jni::Class<MapRenderer>::Singleton(*_env);
-    static auto queueEvent = javaClass.GetMethod<void(
-            jni::Object<MapRendererRunnable>)>(*_env, "queueEvent");
-    auto weakReference = javaPeer.get(*_env);
-    if (weakReference) {
-        weakReference.Call(*_env, queueEvent, peer);
-    }
-
-    // Release the c++ peer as it will be destroyed on GC of the Java Peer
-    runnable.release();
-}
-
-void MapRenderer::requestRender() {
-    android::UniqueEnv _env = android::AttachEnv();
-    static auto& javaClass = jni::Class<MapRenderer>::Singleton(*_env);
-    static auto onInvalidate = javaClass.GetMethod<void()>(*_env, "requestRender");
-    auto weakReference = javaPeer.get(*_env);
-    if (weakReference) {
-        weakReference.Call(*_env, onInvalidate);
-    }
-}
-
-void MapRenderer::update(std::shared_ptr<UpdateParameters> params) {
-    // Lock on the parameters
-    std::lock_guard<std::mutex> lock(updateMutex);
-    updateParameters = std::move(params);
-}
-
-void MapRenderer::setObserver(std::shared_ptr<RendererObserver> _rendererObserver) {
-    // Lock as the initialization can come from the main thread or the GL thread first
-    std::lock_guard<std::mutex> lock(initialisationMutex);
-
-    rendererObserver = std::move(_rendererObserver);
-
-    // Set the new observer on the Renderer implementation
-    if (renderer) {
-        renderer->setObserver(rendererObserver.get());
-    }
-}
-
-void MapRenderer::requestSnapshot(SnapshotCallback callback) {
-    auto self = ActorRef<MapRenderer>(*this, mailboxData.getMailbox());
-    self.invoke(
-            &MapRenderer::scheduleSnapshot,
-            std::make_unique<SnapshotCallback>([&, callback=std::move(callback), runloop=util::RunLoop::Get()](PremultipliedImage image) {
-                runloop->invoke([callback=std::move(callback), image=std::move(image), renderer=std::move(this)]() mutable {
-                    if (renderer && !renderer->destroyed) {
-                        callback(std::move(image));
-                    }
-                });
-                snapshotCallback.reset();
-            })
-    );
-}
-
-// Called on OpenGL thread //
-
-void MapRenderer::resetRenderer() {
-    renderer.reset();
-}
-
-void MapRenderer::scheduleSnapshot(std::unique_ptr<SnapshotCallback> callback) {
-    snapshotCallback = std::move(callback);
-    requestRender();
-}
-
-void MapRenderer::render(JNIEnv&) {
-    assert (renderer);
-
-    std::shared_ptr<UpdateParameters> params;
-    {
-        // Lock on the parameters
-        std::unique_lock<std::mutex> lock(updateMutex);
-        if (!updateParameters) return;
-
-        // Hold on to the update parameters during render
-        params = updateParameters;
-    }
-
-    // Activate the backend
-    gfx::BackendScope backendGuard { *backend };
-
-    // Ensure that the "current" scheduler on the render thread is
-    // this scheduler.
-    Scheduler::SetCurrent(this);
-
-    if (framebufferSizeChanged) {
-        backend->updateViewPort();
-        framebufferSizeChanged = false;
-    }
-
-    renderer->render(params);
-
-    // Deliver the snapshot if requested
-    if (snapshotCallback) {
-        snapshotCallback->operator()(backend->readFramebuffer());
-        snapshotCallback.reset();
-    }
-}
-
-void MapRenderer::onSurfaceCreated(JNIEnv&) {
-    // Lock as the initialization can come from the main thread or the GL thread first
-    std::lock_guard<std::mutex> lock(initialisationMutex);
-
-    // The GL context is already active if get a new surface.
-    gfx::BackendScope backendGuard { *backend, gfx::BackendScope::ScopeType::Implicit };
-
-    // The android system will have already destroyed the underlying
-    // GL resources if this is not the first initialization and an
-    // attempt to clean them up will fail
-    if (backend) backend->markContextLost();
-    if (renderer) renderer->markContextLost();
-
-    // Reset in opposite order
-    renderer.reset();
-    backend.reset();
-
-    // Create the new backend and renderer
-    backend = std::make_unique<AndroidRendererBackend>();
-    renderer = std::make_unique<Renderer>(*backend, pixelRatio, localIdeographFontFamily);
-    rendererRef = std::make_unique<ActorRef<Renderer>>(*renderer, mailboxData.getMailbox());
-
-    // Set the observer on the new Renderer implementation
-    if (rendererObserver) {
-        renderer->setObserver(rendererObserver.get());
-    }
-}
-
-void MapRenderer::onSurfaceChanged(JNIEnv& env, jint width, jint height) {
-    if (!renderer) {
-        // In case the surface has been destroyed (due to app back-grounding)
-        onSurfaceCreated(env);
-    }
-
-    backend->resizeFramebuffer(width, height);
-    framebufferSizeChanged = true;
-    requestRender();
-}
-
-void MapRenderer::onRendererReset(JNIEnv&) {
-    // Make sure to destroy the renderer on the GL Thread
-    auto self = ActorRef<MapRenderer>(*this, mailboxData.getMailbox());
-    self.ask(&MapRenderer::resetRenderer).wait();
-}
-
-// needs to be called on GL thread
-void MapRenderer::onSurfaceDestroyed(JNIEnv&) {
-    resetRenderer();
-}
-
-// Static methods //
-
-void MapRenderer::registerNative(jni::JNIEnv& env) {
-    // Lookup the class
-    static auto& javaClass = jni::Class<MapRenderer>::Singleton(env);
-
-#define METHOD(MethodPtr, name) jni::MakeNativePeerMethod<decltype(MethodPtr), (MethodPtr)>(name)
-
-    // Register the peer
-    jni::RegisterNativePeer<MapRenderer>(env, javaClass, "nativePtr",
-                                         jni::MakePeer<MapRenderer, const jni::Object<MapRenderer>&, jni::jfloat, const jni::String&>,
-                                         "nativeInitialize", "finalize",
-                                         METHOD(&MapRenderer::render, "nativeRender"),
-                                         METHOD(&MapRenderer::onRendererReset, "nativeReset"),
-                                         METHOD(&MapRenderer::onSurfaceCreated,
-                                                "nativeOnSurfaceCreated"),
-                                         METHOD(&MapRenderer::onSurfaceChanged,
-                                                "nativeOnSurfaceChanged"),
-                                         METHOD(&MapRenderer::onSurfaceDestroyed,
-                                                "nativeOnSurfaceDestroyed"));
-}
-
-MapRenderer& MapRenderer::getNativePeer(JNIEnv& env, const jni::Object<MapRenderer>& jObject) {
-    static auto& javaClass = jni::Class<MapRenderer>::Singleton(env);
-    static auto field = javaClass.GetField<jlong>(env, "nativePtr");
-    MapRenderer* mapRenderer = reinterpret_cast<MapRenderer*>(jObject.Get(env, field));
-    assert(mapRenderer != nullptr);
-    return *mapRenderer;
-}
-
-} // namespace android
-} // namespace mbgl
diff --git a/platform/android/src/map_renderer.hpp b/platform/android/src/map_renderer.hpp
deleted file mode 100644
index e37d37cfc8..0000000000
--- a/platform/android/src/map_renderer.hpp
+++ /dev/null
@@ -1,138 +0,0 @@
-#pragma once
-
-#include <mbgl/actor/actor_ref.hpp>
-#include <mbgl/actor/scheduler.hpp>
-#include <mbgl/util/image.hpp>
-#include <mbgl/util/optional.hpp>
-
-#include <memory>
-#include <mutex>
-#include <utility>
-
-#include <jni/jni.hpp>
-
-namespace mbgl {
-
-template <class>
-class ActorRef;
-class Mailbox;
-class Renderer;
-class RendererBackend;
-class RendererObserver;
-class ThreadPool;
-class UpdateParameters;
-
-namespace android {
-
-class AndroidRendererBackend;
-
-/**
- * The MapRenderer is a peer class that encapsulates the actions
- * performed on the GL Thread.
- *
- * The public methods are safe to call from the main thread, others are not.
- */
-class MapRenderer : public Scheduler {
-public:
-
-    static constexpr auto Name() { return "com/mapbox/mapboxsdk/maps/renderer/MapRenderer"; };
-
-    static void registerNative(jni::JNIEnv&);
-
-    static MapRenderer& getNativePeer(JNIEnv&, const jni::Object<MapRenderer>&);
-
-    MapRenderer(jni::JNIEnv& _env,
-                const jni::Object<MapRenderer>&,
-                jni::jfloat pixelRatio,
-                const jni::String& localIdeographFontFamily);
-
-    ~MapRenderer() override;
-
-    // Resets the renderer to clean up on the calling thread
-    void reset();
-
-    // Takes the RendererObserver by shared_ptr so we
-    // don't have to make the header public. Use
-    // this instead of Renderer#setObserver directly
-    void setObserver(std::shared_ptr<RendererObserver>);
-
-    // Sets the new update parameters to use on subsequent
-    // renders. Be sure to trigger a render with
-    // requestRender().
-    void update(std::shared_ptr<UpdateParameters>);
-
-    // Gives a handle to the Renderer to enable actions on
-    // any thread.
-    ActorRef<Renderer> actor() const;
-
-    // From Scheduler. Schedules by using callbacks to the
-    // JVM to process the mailbox on the right thread.
-    void schedule(std::function<void()> scheduled) override;
-    mapbox::base::WeakPtr<Scheduler> makeWeakPtr() override { return weakFactory.makeWeakPtr(); }
-
-    void requestRender();
-
-    // Snapshot - requires a RunLoop on the calling thread
-    using SnapshotCallback = std::function<void (PremultipliedImage)>;
-    void requestSnapshot(SnapshotCallback);
-
-protected:
-    // Called from the GL Thread //
-
-    void scheduleSnapshot(std::unique_ptr<SnapshotCallback>);
-
-private:
-    struct MailboxData {
-        explicit MailboxData(Scheduler*);
-        std::shared_ptr<Mailbox> getMailbox() const noexcept;
-
-    private:
-        Scheduler* scheduler;
-        mutable std::shared_ptr<Mailbox> mailbox;
-    };
-    // Called from the GL Thread //
-
-    // Resets the renderer
-    void resetRenderer();
-
-    // Renders a frame.
-    void render(JNIEnv&);
-
-    void onSurfaceCreated(JNIEnv&);
-
-    void onSurfaceChanged(JNIEnv&, jint width, jint height);
-
-    void onSurfaceDestroyed(JNIEnv&);
-
-private:
-    // Called on either Main or GL thread //
-    void onRendererReset(JNIEnv&);
-
-private:
-    jni::WeakReference<jni::Object<MapRenderer>, jni::EnvAttachingDeleter> javaPeer;
-
-    float pixelRatio;
-    optional<std::string> localIdeographFontFamily;
-
-    std::shared_ptr<ThreadPool> threadPool;
-    const MailboxData mailboxData;
-
-    std::mutex initialisationMutex;
-    std::shared_ptr<RendererObserver> rendererObserver;
-
-    std::unique_ptr<AndroidRendererBackend> backend;
-    std::unique_ptr<Renderer> renderer;
-    std::unique_ptr<ActorRef<Renderer>> rendererRef;
-
-    std::shared_ptr<UpdateParameters> updateParameters;
-    std::mutex updateMutex;
-
-    bool framebufferSizeChanged = false;
-    std::atomic<bool> destroyed {false};
-
-    std::unique_ptr<SnapshotCallback> snapshotCallback;
-    mapbox::base::WeakPtrFactory<Scheduler> weakFactory{this};
-};
-
-} // namespace android
-} // namespace mbgl
diff --git a/platform/android/src/map_renderer_runnable.cpp b/platform/android/src/map_renderer_runnable.cpp
deleted file mode 100644
index 227f49ee3f..0000000000
--- a/platform/android/src/map_renderer_runnable.cpp
+++ /dev/null
@@ -1,49 +0,0 @@
-#include "map_renderer_runnable.hpp"
-
-#include <mbgl/util/logging.hpp>
-
-namespace mbgl {
-namespace android {
-
-MapRendererRunnable::MapRendererRunnable(jni::JNIEnv& env, std::function<void()> function_)
-    : function(std::move(function_)) {
-    // Create the Java peer and hold on to a global reference
-    // Not using a weak reference here as this might oerflow
-    // the weak reference table on some devices
-    jni::UniqueLocalFrame frame = jni::PushLocalFrame(env, 5);
-    static auto& javaClass = jni::Class<MapRendererRunnable>::Singleton(env);
-    static auto constructor = javaClass.GetConstructor<jlong>(env);
-    auto instance = javaClass.New(env, constructor, reinterpret_cast<jlong>(this));
-    javaPeer = jni::NewGlobal(env, instance);
-}
-
-MapRendererRunnable::~MapRendererRunnable() = default;
-
-void MapRendererRunnable::run(jni::JNIEnv&) {
-    if (function) function();
-}
-
-jni::Global<jni::Object<MapRendererRunnable>> MapRendererRunnable::peer() {
-    return std::move(javaPeer);
-}
-
-// Static methods //
-
-void MapRendererRunnable::registerNative(jni::JNIEnv& env) {
-    // Lookup the class
-    static auto& javaClass = jni::Class<MapRendererRunnable>::Singleton(env);
-
-#define METHOD(MethodPtr, name) jni::MakeNativePeerMethod<decltype(MethodPtr), (MethodPtr)>(name)
-
-    jni::RegisterNativePeer<MapRendererRunnable>(
-            env,
-            javaClass,
-            "nativePtr",
-            std::make_unique<MapRendererRunnable, JNIEnv&>,
-            "nativeInitialize",
-            "finalize",
-            METHOD(&MapRendererRunnable::run, "run"));
-}
-
-} // namespace android
-} // namespace mbgl
diff --git a/platform/android/src/map_renderer_runnable.hpp b/platform/android/src/map_renderer_runnable.hpp
deleted file mode 100644
index 24d0f2af49..0000000000
--- a/platform/android/src/map_renderer_runnable.hpp
+++ /dev/null
@@ -1,47 +0,0 @@
-#pragma once
-
-#include <mbgl/actor/mailbox.hpp>
-#include <mbgl/actor/scheduler.hpp>
-
-#include <memory>
-#include <utility>
-
-#include <jni/jni.hpp>
-
-namespace mbgl {
-namespace android {
-
-/**
- * The MapRendererRunnable is a peer class that encapsulates
- * a scheduled mailbox in a Java Runnable so it can be
- * scheduled on the map renderer thread.
- *
- */
-class MapRendererRunnable {
-public:
-
-    static constexpr auto Name() { return "com/mapbox/mapboxsdk/maps/renderer/MapRendererRunnable"; };
-
-    static void registerNative(jni::JNIEnv&);
-
-    MapRendererRunnable(jni::JNIEnv&, std::function<void()>);
-
-    // Only for jni registration, unused
-    MapRendererRunnable(jni::JNIEnv&) {
-        assert(false);
-    }
-
-    ~MapRendererRunnable();
-
-    void run(jni::JNIEnv&);
-
-    // Transfers ownership of the Peer object to the caller
-    jni::Global<jni::Object<MapRendererRunnable>> peer();
-
-private:
-    jni::Global<jni::Object<MapRendererRunnable>> javaPeer;
-    std::function<void()> function;
-};
-
-} // namespace android
-} // namespace mbgl
diff --git a/platform/android/src/mapbox.cpp b/platform/android/src/mapbox.cpp
deleted file mode 100644
index 5246739cf6..0000000000
--- a/platform/android/src/mapbox.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-#include "mapbox.hpp"
-
-namespace mbgl {
-namespace android {
-
-jni::Local<jni::Object<AssetManager>> Mapbox::getAssetManager(jni::JNIEnv& env) {
-    static auto& javaClass = jni::Class<Mapbox>::Singleton(env);
-    auto method = javaClass.GetStaticMethod<jni::Object<AssetManager>()>(env, "getAssetManager");
-    return javaClass.Call(env, method);
-}
-
-jboolean Mapbox::hasInstance(jni::JNIEnv& env) {
-    static auto& javaClass = jni::Class<Mapbox>::Singleton(env);
-    auto method = javaClass.GetStaticMethod<jboolean()>(env, "hasInstance");
-    return javaClass.Call(env, method);
-}
-
-void Mapbox::registerNative(jni::JNIEnv& env) {
-    jni::Class<Mapbox>::Singleton(env);
-}
-
-} // namespace android
-} // namespace mbgl
diff --git a/platform/android/src/mapbox.hpp b/platform/android/src/mapbox.hpp
deleted file mode 100644
index 813f5bf174..0000000000
--- a/platform/android/src/mapbox.hpp
+++ /dev/null
@@ -1,19 +0,0 @@
-#pragma once
-
-#include "asset_manager.hpp"
-
-#include <jni/jni.hpp>
-
-namespace mbgl {
-namespace android {
-
-class Mapbox {
-public:
-    static constexpr auto Name() { return "com/mapbox/mapboxsdk/Mapbox"; };
-    static jboolean hasInstance(jni::JNIEnv&);
-    static jni::Local<jni::Object<AssetManager>> getAssetManager(jni::JNIEnv&);
-    static void registerNative(jni::JNIEnv&);
-};
-
-} // namespace android
-} // namespace mbgl
diff --git a/platform/android/src/native_map_view.cpp b/platform/android/src/native_map_view.cpp
deleted file mode 100644
index ddb2e2c3b9..0000000000
--- a/platform/android/src/native_map_view.cpp
+++ /dev/null
@@ -1,1263 +0,0 @@
-#include "native_map_view.hpp"
-
-#include <cstdlib>
-#include <ctime>
-#include <cassert>
-#include <memory>
-#include <list>
-#include <tuple>
-
-#include <sys/system_properties.h>
-
-#include <android/native_window_jni.h>
-
-#include <jni/jni.hpp>
-
-#include <mbgl/map/map.hpp>
-#include <mbgl/map/map_options.hpp>
-#include <mbgl/math/minmax.hpp>
-#include <mbgl/util/constants.hpp>
-#include <mbgl/util/event.hpp>
-#include <mbgl/util/exception.hpp>
-#include <mbgl/util/geo.hpp>
-#include <mbgl/util/image.hpp>
-#include <mbgl/util/logging.hpp>
-#include <mbgl/util/platform.hpp>
-#include <mbgl/util/projection.hpp>
-#include <mbgl/style/style.hpp>
-#include <mbgl/style/image.hpp>
-#include <mbgl/style/filter.hpp>
-#include <mbgl/renderer/query.hpp>
-
-// Java -> C++ conversion
-#include "style/android_conversion.hpp"
-#include <mbgl/style/conversion/filter.hpp>
-#include <mbgl/style/conversion_impl.hpp>
-
-// C++ -> Java conversion
-#include "conversion/conversion.hpp"
-#include "conversion/collection.hpp"
-#include "style/conversion/filter.hpp"
-#include "geojson/feature.hpp"
-
-#include "android_renderer_frontend.hpp"
-#include "attach_env.hpp"
-#include "bitmap.hpp"
-#include "bitmap_factory.hpp"
-#include "file_source.hpp"
-#include "geometry/lat_lng_bounds.hpp"
-#include "java/util.hpp"
-#include "jni.hpp"
-#include "map/camera_position.hpp"
-#include "map/image.hpp"
-#include "map_renderer.hpp"
-#include "run_loop_impl.hpp"
-#include "style/light.hpp"
-
-namespace mbgl {
-namespace android {
-
-NativeMapView::NativeMapView(jni::JNIEnv& _env,
-                             const jni::Object<NativeMapView>& _obj,
-                             const jni::Object<FileSource>& jFileSource,
-                             const jni::Object<MapRenderer>& jMapRenderer,
-                             jni::jfloat pixelRatio_,
-                             jni::jboolean crossSourceCollisions_)
-    : javaPeer(_env, _obj), mapRenderer(MapRenderer::getNativePeer(_env, jMapRenderer)), pixelRatio(pixelRatio_) {
-    // Get a reference to the JavaVM for callbacks
-    if (_env.GetJavaVM(&vm) < 0) {
-        _env.ExceptionDescribe();
-        return;
-    }
-
-    // Create a renderer frontend
-    rendererFrontend = std::make_unique<AndroidRendererFrontend>(mapRenderer);
-
-    // Create Map options
-    MapOptions options;
-    options.withMapMode(MapMode::Continuous)
-        .withSize(mbgl::Size{static_cast<uint32_t>(width), static_cast<uint32_t>(height)})
-        .withPixelRatio(pixelRatio)
-        .withConstrainMode(ConstrainMode::HeightOnly)
-        .withViewportMode(ViewportMode::Default)
-        .withCrossSourceCollisions(crossSourceCollisions_);
-
-    // Create the core map
-    map = std::make_unique<mbgl::Map>(
-        *rendererFrontend, *this, options,
-        mbgl::android::FileSource::getSharedResourceOptions(_env, jFileSource));
-}
-
-/**
- * Called through NativeMapView#destroy()
- */
-NativeMapView::~NativeMapView() {
-    map.reset();
-    vm = nullptr;
-}
-
-void NativeMapView::onCameraWillChange(MapObserver::CameraChangeMode mode) {
-    assert(vm != nullptr);
-
-    android::UniqueEnv _env = android::AttachEnv();
-    static auto& javaClass = jni::Class<NativeMapView>::Singleton(*_env);
-    static auto onCameraWillChange = javaClass.GetMethod<void (jboolean)>(*_env, "onCameraWillChange");
-    auto weakReference = javaPeer.get(*_env);
-    if (weakReference) {
-        weakReference.Call(*_env, onCameraWillChange, (jboolean) (mode != MapObserver::CameraChangeMode::Immediate));
-    }
-}
-
-
-void NativeMapView::onCameraIsChanging() {
-    assert(vm != nullptr);
-
-    android::UniqueEnv _env = android::AttachEnv();
-    static auto& javaClass = jni::Class<NativeMapView>::Singleton(*_env);
-    static auto onCameraIsChanging = javaClass.GetMethod<void ()>(*_env, "onCameraIsChanging");
-    auto weakReference = javaPeer.get(*_env);
-    if (weakReference) {
-        weakReference.Call(*_env, onCameraIsChanging);
-    }
-}
-
-void NativeMapView::onCameraDidChange(MapObserver::CameraChangeMode mode) {
-    assert(vm != nullptr);
-
-    android::UniqueEnv _env = android::AttachEnv();
-    static auto& javaClass = jni::Class<NativeMapView>::Singleton(*_env);
-    static auto onCameraDidChange = javaClass.GetMethod<void (jboolean)>(*_env, "onCameraDidChange");
-    auto weakReference = javaPeer.get(*_env);
-    if (weakReference) {
-        weakReference.Call(*_env, onCameraDidChange,
-                                 (jboolean) (mode != MapObserver::CameraChangeMode::Immediate));
-    }
-}
-
-void NativeMapView::onWillStartLoadingMap() {
-    assert(vm != nullptr);
-
-    android::UniqueEnv _env = android::AttachEnv();
-    static auto& javaClass = jni::Class<NativeMapView>::Singleton(*_env);
-    static auto onWillStartLoadingMap = javaClass.GetMethod<void ()>(*_env, "onWillStartLoadingMap");
-    auto weakReference = javaPeer.get(*_env);
-    if (weakReference) {
-        weakReference.Call(*_env, onWillStartLoadingMap);
-    }
-}
-
-void NativeMapView::onDidFinishLoadingMap() {
-    assert(vm != nullptr);
-
-    android::UniqueEnv _env = android::AttachEnv();
-    static auto& javaClass = jni::Class<NativeMapView>::Singleton(*_env);
-    static auto onDidFinishLoadingMap = javaClass.GetMethod<void ()>(*_env, "onDidFinishLoadingMap");
-    auto weakReference = javaPeer.get(*_env);
-    if (weakReference) {
-        weakReference.Call(*_env, onDidFinishLoadingMap);
-    }
-}
-
-void NativeMapView::onDidFailLoadingMap(MapLoadError, const std::string& error) {
-    assert(vm != nullptr);
-
-    android::UniqueEnv _env = android::AttachEnv();
-    static auto& javaClass = jni::Class<NativeMapView>::Singleton(*_env);
-    static auto onDidFailLoadingMap = javaClass.GetMethod<void (jni::String)>(*_env, "onDidFailLoadingMap");
-    auto weakReference = javaPeer.get(*_env);
-    if (weakReference) {
-        weakReference.Call(*_env, onDidFailLoadingMap, jni::Make<jni::String>(*_env, error));
-    }
-}
-
-void NativeMapView::onWillStartRenderingFrame() {
-    assert(vm != nullptr);
-
-    android::UniqueEnv _env = android::AttachEnv();
-    static auto& javaClass = jni::Class<NativeMapView>::Singleton(*_env);
-    static auto onWillStartRenderingFrame = javaClass.GetMethod<void ()>(*_env, "onWillStartRenderingFrame");
-    auto weakReference = javaPeer.get(*_env);
-    if (weakReference) {
-        weakReference.Call(*_env, onWillStartRenderingFrame);
-    }
-}
-
-void NativeMapView::onDidFinishRenderingFrame(MapObserver::RenderFrameStatus status) {
-    assert(vm != nullptr);
-
-    android::UniqueEnv _env = android::AttachEnv();
-    static auto& javaClass = jni::Class<NativeMapView>::Singleton(*_env);
-    static auto onDidFinishRenderingFrame = javaClass.GetMethod<void (jboolean)>(*_env, "onDidFinishRenderingFrame");
-    auto weakReference = javaPeer.get(*_env);
-    if (weakReference) {
-        weakReference.Call(*_env, onDidFinishRenderingFrame, (jboolean) (status.mode != MapObserver::RenderMode::Partial));
-    }
-}
-
-
-void NativeMapView::onWillStartRenderingMap() {
-    assert(vm != nullptr);
-
-    android::UniqueEnv _env = android::AttachEnv();
-    static auto& javaClass = jni::Class<NativeMapView>::Singleton(*_env);
-    static auto onWillStartRenderingMap = javaClass.GetMethod<void ()>(*_env, "onWillStartRenderingMap");
-    auto weakReference = javaPeer.get(*_env);
-    if (weakReference) {
-        weakReference.Call(*_env, onWillStartRenderingMap);
-    }
-}
-
-void NativeMapView::onDidFinishRenderingMap(MapObserver::RenderMode mode) {
-    assert(vm != nullptr);
-
-    android::UniqueEnv _env = android::AttachEnv();
-    static auto& javaClass = jni::Class<NativeMapView>::Singleton(*_env);
-    static auto onDidFinishRenderingMap = javaClass.GetMethod<void (jboolean)>(*_env, "onDidFinishRenderingMap");
-    auto weakReference = javaPeer.get(*_env);
-    if (weakReference) {
-        weakReference.Call(*_env, onDidFinishRenderingMap, (jboolean) (mode != MapObserver::RenderMode::Partial));
-    }
-}
-
-void NativeMapView::onDidBecomeIdle() {
-    assert(vm != nullptr);
-
-    android::UniqueEnv _env = android::AttachEnv();
-    static auto& javaClass = jni::Class<NativeMapView>::Singleton(*_env);
-    static auto onDidBecomeIdle = javaClass.GetMethod<void ()>(*_env, "onDidBecomeIdle");
-    auto weakReference = javaPeer.get(*_env);
-    if (weakReference) {
-        weakReference.Call(*_env, onDidBecomeIdle);
-    }
-}
-
-void NativeMapView::onDidFinishLoadingStyle() {
-    assert(vm != nullptr);
-
-    android::UniqueEnv _env = android::AttachEnv();
-    static auto& javaClass = jni::Class<NativeMapView>::Singleton(*_env);
-    static auto onDidFinishLoadingStyle = javaClass.GetMethod<void ()>(*_env, "onDidFinishLoadingStyle");
-    auto weakReference = javaPeer.get(*_env);
-    if (weakReference) {
-        weakReference.Call(*_env, onDidFinishLoadingStyle);
-    }
-}
-
-void NativeMapView::onSourceChanged(mbgl::style::Source& source) {
-    assert(vm != nullptr);
-
-    android::UniqueEnv _env = android::AttachEnv();
-    static auto& javaClass = jni::Class<NativeMapView>::Singleton(*_env);
-    static auto onSourceChanged = javaClass.GetMethod<void (jni::String)>(*_env, "onSourceChanged");
-    auto sourceId = jni::Make<jni::String>(*_env, source.getID());
-    auto weakReference = javaPeer.get(*_env);
-    if (weakReference) {
-        weakReference.Call(*_env, onSourceChanged, sourceId);
-    }
-}
-
-void NativeMapView::onStyleImageMissing(const std::string& imageId) {
-    assert(vm != nullptr);
-
-    android::UniqueEnv _env = android::AttachEnv();
-    static auto& javaClass = jni::Class<NativeMapView>::Singleton(*_env);
-    static auto onStyleImageMissing = javaClass.GetMethod<void (jni::String)>(*_env, "onStyleImageMissing");
-    auto weakReference = javaPeer.get(*_env);
-    if (weakReference) {
-        weakReference.Call(*_env, onStyleImageMissing, jni::Make<jni::String>(*_env, imageId));
-    }
-}
-
-bool NativeMapView::onCanRemoveUnusedStyleImage(const std::string& imageId) {
-    assert(vm != nullptr);
-
-    android::UniqueEnv _env = android::AttachEnv();
-    static auto& javaClass = jni::Class<NativeMapView>::Singleton(*_env);
-    static auto onCanRemoveUnusedStyleImage = javaClass.GetMethod<jboolean (jni::String)>(*_env, "onCanRemoveUnusedStyleImage");
-    auto weakReference = javaPeer.get(*_env);
-    if (weakReference) {
-        return weakReference.Call(*_env, onCanRemoveUnusedStyleImage, jni::Make<jni::String>(*_env, imageId));
-    }
-
-    return true;
-}
-
-// JNI Methods //
-
-void NativeMapView::resizeView(jni::JNIEnv&, int w, int h) {
-    width = util::max(64, w);
-    height = util::max(64, h);
-    map->setSize({ static_cast<uint32_t>(width), static_cast<uint32_t>(height) });
-}
-
-jni::Local<jni::String> NativeMapView::getStyleUrl(jni::JNIEnv& env) {
-    return jni::Make<jni::String>(env, map->getStyle().getURL());
-}
-
-void NativeMapView::setStyleUrl(jni::JNIEnv& env, const jni::String& url) {
-    map->getStyle().loadURL(jni::Make<std::string>(env, url));
-}
-
-jni::Local<jni::String> NativeMapView::getStyleJson(jni::JNIEnv& env) {
-    return jni::Make<jni::String>(env, map->getStyle().getJSON());
-}
-
-void NativeMapView::setStyleJson(jni::JNIEnv& env, const jni::String& json) {
-    map->getStyle().loadJSON(jni::Make<std::string>(env, json));
-}
-
-void NativeMapView::setLatLngBounds(jni::JNIEnv& env, const jni::Object<mbgl::android::LatLngBounds>& jBounds) {
-    mbgl::BoundOptions bounds;
-    if (jBounds) {
-        bounds.withLatLngBounds(mbgl::android::LatLngBounds::getLatLngBounds(env, jBounds));
-    } else {
-        bounds.withLatLngBounds(mbgl::LatLngBounds());
-    }
-    map->setBounds(bounds);
-}
-
-void NativeMapView::cancelTransitions(jni::JNIEnv&) {
-    map->cancelTransitions();
-}
-
-void NativeMapView::setGestureInProgress(jni::JNIEnv&, jni::jboolean inProgress) {
-    map->setGestureInProgress(inProgress);
-}
-
-void NativeMapView::moveBy(jni::JNIEnv&, jni::jdouble dx, jni::jdouble dy, jni::jlong duration) {
-    mbgl::AnimationOptions animationOptions;
-    if (duration > 0) {
-       animationOptions.duration.emplace(mbgl::Milliseconds(duration));
-       animationOptions.easing.emplace(mbgl::util::UnitBezier {0.25, 0.46, 0.45, 0.94});
-    }
-    map->moveBy({dx, dy}, animationOptions);
-}
-
-void NativeMapView::jumpTo(jni::JNIEnv& env, jni::jdouble bearing, jni::jdouble latitude, jni::jdouble longitude, jni::jdouble pitch, jni::jdouble zoom, const jni::Array<jni::jdouble>& padding) {
-    mbgl::CameraOptions options;
-    if (bearing != -1) {
-        options.bearing = bearing;
-    }
-    options.center = mbgl::LatLng(latitude, longitude);
-    if (padding) {
-        assert(padding.Length(env) == 4);
-        options.padding = mbgl::EdgeInsets{padding.Get(env, 0), padding.Get(env, 1),
-                                           padding.Get(env, 2), padding.Get(env, 3)};
-    }
-    if (pitch != -1) {
-        options.pitch = pitch;
-    }
-    if (zoom != -1) {
-        options.zoom = zoom;
-    }
-
-    map->jumpTo(options);
-}
-
-void NativeMapView::easeTo(jni::JNIEnv& env, jni::jdouble bearing, jni::jdouble latitude, jni::jdouble longitude, jni::jlong duration, jni::jdouble pitch, jni::jdouble zoom, const jni::Array<jni::jdouble>& padding, jni::jboolean easing) {
-    mbgl::CameraOptions cameraOptions;
-    if (bearing != -1) {
-        cameraOptions.bearing = bearing;
-    }
-    cameraOptions.center = mbgl::LatLng(latitude, longitude);
-    if (padding) {
-        assert(padding.Length(env) == 4);
-        cameraOptions.padding = mbgl::EdgeInsets{padding.Get(env, 0), padding.Get(env, 1),
-                                           padding.Get(env, 2), padding.Get(env, 3)};
-    }
-    if (pitch != -1) {
-        cameraOptions.pitch = pitch;
-    }
-    if (zoom != -1) {
-        cameraOptions.zoom = zoom;
-    }
-
-    mbgl::AnimationOptions animationOptions;
-    animationOptions.duration.emplace(mbgl::Milliseconds(duration));
-    if (!easing) {
-       // add a linear interpolator instead of easing
-       animationOptions.easing.emplace(mbgl::util::UnitBezier { 0, 0, 1, 1 });
-    }
-
-    map->easeTo(cameraOptions, animationOptions);
-}
-
-void NativeMapView::flyTo(jni::JNIEnv& env, jni::jdouble bearing, jni::jdouble latitude, jni::jdouble longitude, jni::jlong duration, jni::jdouble pitch, jni::jdouble zoom, const jni::Array<jni::jdouble>& padding) {
-    mbgl::CameraOptions cameraOptions;
-    if (bearing != -1) {
-        cameraOptions.bearing = bearing;
-    }
-    cameraOptions.center = mbgl::LatLng(latitude, longitude);
-    if (padding) {
-        assert(padding.Length(env) == 4);
-        cameraOptions.padding = mbgl::EdgeInsets{padding.Get(env, 0), padding.Get(env, 1),
-                                                 padding.Get(env, 2), padding.Get(env, 3)};
-    }
-    if (pitch != -1) {
-        cameraOptions.pitch = pitch;
-    }
-    if (zoom != -1) {
-        cameraOptions.zoom = zoom;
-    }
-
-    mbgl::AnimationOptions animationOptions;
-    animationOptions.duration.emplace(mbgl::Milliseconds(duration));
-    map->flyTo(cameraOptions, animationOptions);
-}
-
-jni::Local<jni::Object<LatLng>> NativeMapView::getLatLng(JNIEnv& env) {
-    return LatLng::New(env, *map->getCameraOptions(mbgl::nullopt).center);
-}
-
-void NativeMapView::setLatLng(jni::JNIEnv& env, jni::jdouble latitude, jni::jdouble longitude, const jni::Array<jni::jdouble>& padding, jni::jlong duration) {
-    mbgl::CameraOptions cameraOptions;
-    cameraOptions.center = mbgl::LatLng(latitude, longitude);
-    if (padding) {
-        assert(padding.Length(env) == 4);
-        cameraOptions.padding = mbgl::EdgeInsets{padding.Get(env, 0), padding.Get(env, 1),
-                                                 padding.Get(env, 2), padding.Get(env, 3)};
-    }
-    map->easeTo(cameraOptions, mbgl::AnimationOptions{mbgl::Milliseconds(duration)});
-}
-
-jni::Local<jni::Object<CameraPosition>> NativeMapView::getCameraForLatLngBounds(jni::JNIEnv& env, const jni::Object<LatLngBounds>& jBounds, double top, double left, double bottom, double right, double bearing, double tilt) {
-    mbgl::EdgeInsets padding = {top, left, bottom, right};
-    return CameraPosition::New(env, map->cameraForLatLngBounds(mbgl::android::LatLngBounds::getLatLngBounds(env, jBounds), padding, bearing, tilt), pixelRatio);
-}
-
-jni::Local<jni::Object<CameraPosition>> NativeMapView::getCameraForGeometry(jni::JNIEnv& env, const jni::Object<geojson::Geometry>& jGeometry, double top, double left, double bottom, double right, double bearing, double tilt) {
-    auto geometry = geojson::Geometry::convert(env, jGeometry);
-    mbgl::EdgeInsets padding = {top, left, bottom, right};
-    return CameraPosition::New(env, map->cameraForGeometry(geometry, padding, bearing, tilt), pixelRatio);
-}
-
-void NativeMapView::setReachability(jni::JNIEnv&, jni::jboolean reachable) {
-    if (reachable) {
-        mbgl::NetworkStatus::Reachable();
-    }
-}
-
-void NativeMapView::resetPosition(jni::JNIEnv&) {
-    map->jumpTo(mbgl::CameraOptions().withCenter(mbgl::LatLng {}).withZoom(0.0).withBearing(0.0).withPitch(0.0));
-}
-
-jni::jdouble NativeMapView::getPitch(jni::JNIEnv&) {
-    return *map->getCameraOptions().pitch;
-}
-
-void NativeMapView::setPitch(jni::JNIEnv&, jni::jdouble pitch, jni::jlong duration) {
-    map->easeTo(mbgl::CameraOptions().withPitch(pitch),
-                mbgl::AnimationOptions{ mbgl::Milliseconds(duration) });
-}
-
-void NativeMapView::setZoom(jni::JNIEnv&, jni::jdouble zoom, jni::jdouble x, jni::jdouble y, jni::jlong duration) {
-    map->easeTo(mbgl::CameraOptions().withZoom(zoom).withAnchor(mbgl::ScreenCoordinate{ x, y }),
-                mbgl::AnimationOptions{ mbgl::Milliseconds(duration) });
-}
-
-jni::jdouble NativeMapView::getZoom(jni::JNIEnv&) {
-    return *map->getCameraOptions().zoom;
-}
-
-void NativeMapView::resetZoom(jni::JNIEnv&) {
-    map->jumpTo(mbgl::CameraOptions().withZoom(0.0));
-}
-
-void NativeMapView::setMinZoom(jni::JNIEnv&, jni::jdouble zoom) {
-    map->setBounds(BoundOptions().withMinZoom(zoom));
-}
-
-jni::jdouble NativeMapView::getMinZoom(jni::JNIEnv&) {
-    return *map->getBounds().minZoom;
-}
-
-void NativeMapView::setMaxZoom(jni::JNIEnv&, jni::jdouble zoom) {
-    map->setBounds(BoundOptions().withMaxZoom(zoom));
-}
-
-jni::jdouble NativeMapView::getMaxZoom(jni::JNIEnv&) {
-    return *map->getBounds().maxZoom;
-}
-
-void NativeMapView::setMinPitch(jni::JNIEnv&, jni::jdouble pitch) {
-    map->setBounds(BoundOptions().withMinPitch(pitch));
-}
-
-jni::jdouble NativeMapView::getMinPitch(jni::JNIEnv&) {
-    return *map->getBounds().minPitch;
-}
-
-void NativeMapView::setMaxPitch(jni::JNIEnv&, jni::jdouble pitch) {
-    map->setBounds(BoundOptions().withMaxPitch(pitch));
-}
-
-jni::jdouble NativeMapView::getMaxPitch(jni::JNIEnv&) {
-    return *map->getBounds().maxPitch;
-}
-
-void NativeMapView::rotateBy(jni::JNIEnv&, jni::jdouble sx, jni::jdouble sy, jni::jdouble ex, jni::jdouble ey, jni::jlong duration) {
-    mbgl::ScreenCoordinate first(sx, sy);
-    mbgl::ScreenCoordinate second(ex, ey);
-    map->rotateBy(first, second, mbgl::AnimationOptions{mbgl::Milliseconds(duration)});
-}
-
-void NativeMapView::setBearing(jni::JNIEnv&, jni::jdouble degrees, jni::jlong duration) {
-    map->easeTo(mbgl::CameraOptions().withBearing(degrees), mbgl::AnimationOptions{mbgl::Milliseconds(duration)});
-}
-
-void NativeMapView::setBearingXY(jni::JNIEnv&, jni::jdouble degrees, jni::jdouble cx, jni::jdouble cy, jni::jlong duration) {
-    mbgl::ScreenCoordinate anchor(cx, cy);
-    map->easeTo(mbgl::CameraOptions().withBearing(degrees).withAnchor(anchor), mbgl::AnimationOptions{mbgl::Milliseconds(duration)});
-}
-
-jni::jdouble NativeMapView::getBearing(jni::JNIEnv&) {
-    return *map->getCameraOptions().bearing;
-}
-
-void NativeMapView::resetNorth(jni::JNIEnv&) {
-    map->easeTo(mbgl::CameraOptions().withBearing(0.0), mbgl::AnimationOptions {{mbgl::Milliseconds(500)}});
-}
-
-void NativeMapView::setVisibleCoordinateBounds(JNIEnv& env, const jni::Array<jni::Object<LatLng>>& coordinates, const jni::Object<RectF>& padding, jdouble direction, jni::jlong duration) {
-    NullCheck(env, &coordinates);
-    std::size_t count = coordinates.Length(env);
-
-    std::vector<mbgl::LatLng> latLngs;
-    latLngs.reserve(count);
-
-    for (std::size_t i = 0; i < count; i++) {
-        latLngs.push_back(LatLng::getLatLng(env, coordinates.Get(env, i)));
-    }
-
-    mbgl::EdgeInsets mbglInsets = { RectF::getTop(env, padding), RectF::getLeft(env, padding), RectF::getBottom(env, padding), RectF::getRight(env, padding) };
-    mbgl::CameraOptions cameraOptions = map->cameraForLatLngs(latLngs, mbglInsets);
-    if (direction >= 0) {
-        cameraOptions.bearing = direction;
-    }
-
-    mbgl::AnimationOptions animationOptions;
-    if (duration > 0) {
-        animationOptions.duration.emplace(mbgl::Milliseconds(duration));
-        // equivalent to kCAMediaTimingFunctionDefault in iOS
-        animationOptions.easing.emplace(mbgl::util::UnitBezier { 0.25, 0.1, 0.25, 0.1 });
-    }
-
-    map->easeTo(cameraOptions, animationOptions);
-}
-
-void NativeMapView::getVisibleCoordinateBounds(JNIEnv& env, jni::Array<jdouble>& output) {
-    auto latlngBounds = map->latLngBoundsForCameraUnwrapped(map->getCameraOptions(mbgl::nullopt));
-
-    double latNorth = latlngBounds.north();
-    double lonEast = latlngBounds.east();
-    double latSouth = latlngBounds.south();
-    double lonWest = latlngBounds.west();
-
-    std::vector<jdouble> buffer;
-    buffer.reserve(4);
-
-    // Order of the LatLngBounds: double latNorth, double lonEast, double latSouth, double lonWest
-    buffer.push_back(latNorth);
-    buffer.push_back(lonEast);
-    buffer.push_back(latSouth);
-    buffer.push_back(lonWest);
-
-    output.SetRegion<std::vector<jdouble>>(env, 0, buffer);
-}
-
-void NativeMapView::scheduleSnapshot(jni::JNIEnv&) {
-    mapRenderer.requestSnapshot([&](PremultipliedImage image) {
-        auto _env = android::AttachEnv();
-        // Convert image to bitmap
-        auto bitmap = Bitmap::CreateBitmap(*_env, std::move(image));
-
-        // invoke Mapview#OnSnapshotReady
-        static auto& javaClass = jni::Class<NativeMapView>::Singleton(*_env);
-        static auto onSnapshotReady = javaClass.GetMethod<void (jni::Object<Bitmap>)>(*_env, "onSnapshotReady");
-        auto weakReference = javaPeer.get(*_env);
-        if (weakReference) {
-            weakReference.Call(*_env, onSnapshotReady, bitmap);
-        }
-    });
-}
-
-jni::Local<jni::Object<CameraPosition>> NativeMapView::getCameraPosition(jni::JNIEnv& env) {
-    return CameraPosition::New(env, map->getCameraOptions(mbgl::nullopt), pixelRatio);
-}
-
-void NativeMapView::updateMarker(jni::JNIEnv& env, jni::jlong markerId, jni::jdouble lat, jni::jdouble lon, const jni::String& jid) {
-    if (markerId == -1) {
-        return;
-    }
-
-    std::string iconId = jni::Make<std::string>(env, jid);
-    // Because Java only has int, not unsigned int, we need to bump the annotation id up to a long.
-    map->updateAnnotation(markerId, mbgl::SymbolAnnotation { mbgl::Point<double>(lon, lat), iconId });
-}
-
-jni::Local<jni::Array<jni::jlong>> NativeMapView::addMarkers(jni::JNIEnv& env, const jni::Array<jni::Object<Marker>>& jmarkers) {
-    jni::NullCheck(env, &jmarkers);
-    std::size_t len = jmarkers.Length(env);
-
-    std::vector<jni::jlong> ids;
-    ids.reserve(len);
-
-    for (std::size_t i = 0; i < len; i++) {
-        auto marker = jmarkers.Get(env, i);
-        ids.push_back(map->addAnnotation(mbgl::SymbolAnnotation {
-            Marker::getPosition(env, marker),
-            Marker::getIconId(env, marker)
-        }));
-    }
-
-    auto result = jni::Array<jni::jlong>::New(env, len);
-    result.SetRegion<std::vector<jni::jlong>>(env, 0, ids);
-
-    return result;
-}
-
-void NativeMapView::onLowMemory(JNIEnv&) {
-    rendererFrontend->reduceMemoryUse();
-}
-
-using DebugOptions = mbgl::MapDebugOptions;
-
-void NativeMapView::setDebug(JNIEnv&, jni::jboolean debug) {
-    DebugOptions debugOptions = debug ? DebugOptions::TileBorders | DebugOptions::ParseStatus | DebugOptions::Collision
-                                      : DebugOptions::NoDebug;
-    map->setDebug(debugOptions);
-}
-
-jni::jboolean NativeMapView::getDebug(JNIEnv&) {
-    return map->getDebug() != DebugOptions::NoDebug;
-}
-
-jni::jboolean NativeMapView::isFullyLoaded(JNIEnv&) {
-    return map->isFullyLoaded();
-}
-
-jni::jdouble NativeMapView::getMetersPerPixelAtLatitude(JNIEnv&, jni::jdouble lat, jni::jdouble zoom) {
-    return mbgl::Projection::getMetersPerPixelAtLatitude(lat, zoom);
-}
-
-jni::Local<jni::Object<ProjectedMeters>> NativeMapView::projectedMetersForLatLng(JNIEnv& env, jni::jdouble latitude, jni::jdouble longitude) {
-    mbgl::ProjectedMeters projectedMeters = mbgl::Projection::projectedMetersForLatLng(mbgl::LatLng(latitude, longitude));
-    return ProjectedMeters::New(env, projectedMeters.northing(), projectedMeters.easting());
-}
-
-jni::Local<jni::Object<LatLng>> NativeMapView::latLngForProjectedMeters(JNIEnv& env, jdouble northing, jdouble easting) {
-    return LatLng::New(env, mbgl::Projection::latLngForProjectedMeters(mbgl::ProjectedMeters(northing, easting)));
-}
-
-jni::Local<jni::Object<PointF>> NativeMapView::pixelForLatLng(JNIEnv& env, jdouble latitude, jdouble longitude) {
-    mbgl::ScreenCoordinate pixel = map->pixelForLatLng(mbgl::LatLng(latitude, longitude));
-    return PointF::New(env, static_cast<float>(pixel.x), static_cast<float>(pixel.y));
-}
-
-void NativeMapView::pixelsForLatLngs(JNIEnv& env,
-                                     const jni::Array<jdouble>& input,
-                                     jni::Array<jdouble>& output,
-                                     jfloat pixelRatio_) {
-    jni::NullCheck(env, &input);
-    std::size_t len = input.Length(env);
-
-    std::vector<mbgl::LatLng> latLngs;
-    latLngs.reserve(len);
-
-    for (std::size_t i = 0; i < len; i += 2) {
-        auto latLng = mbgl::LatLng(input.Get(env, i), input.Get(env, i + 1));
-        latLngs.push_back(latLng);
-    }
-
-    std::vector<jdouble> buffer;
-    buffer.reserve(len);
-    std::vector<ScreenCoordinate> coordinates = map->pixelsForLatLngs(latLngs);
-    for (std::size_t i = 0; i < len / 2; i++) {
-        buffer.push_back(coordinates[i].x * pixelRatio_);
-        buffer.push_back(coordinates[i].y * pixelRatio_);
-    }
-
-    output.SetRegion<std::vector<jdouble>>(env, 0, buffer);
-}
-
-jni::Local<jni::Object<LatLng>> NativeMapView::latLngForPixel(JNIEnv& env, jfloat x, jfloat y) {
-    return LatLng::New(env, map->latLngForPixel(mbgl::ScreenCoordinate(x, y)));
-}
-
-void NativeMapView::latLngsForPixels(JNIEnv& env,
-                                     const jni::Array<jdouble>& input,
-                                     jni::Array<jdouble>& output,
-                                     jfloat pixelRatio_) {
-    jni::NullCheck(env, &input);
-    std::size_t len = input.Length(env);
-
-    std::vector<mbgl::ScreenCoordinate> coordinates;
-    coordinates.reserve(len);
-
-    for (std::size_t i = 0; i < len; i += 2) {
-        auto coordinate = mbgl::ScreenCoordinate(input.Get(env, i) / pixelRatio_, input.Get(env, i + 1) / pixelRatio_);
-        coordinates.push_back(coordinate);
-    }
-
-    std::vector<jdouble> buffer;
-    buffer.reserve(len);
-    std::vector<mbgl::LatLng> latLngs = map->latLngsForPixels(coordinates);
-    for (std::size_t i = 0; i < len / 2; i++) {
-        buffer.push_back(latLngs[i].latitude());
-        buffer.push_back(latLngs[i].longitude());
-    }
-
-    output.SetRegion<std::vector<jdouble>>(env, 0, buffer);
-}
-
-jni::Local<jni::Array<jlong>> NativeMapView::addPolylines(JNIEnv& env, const jni::Array<jni::Object<Polyline>>& polylines) {
-    NullCheck(env, &polylines);
-    std::size_t len = polylines.Length(env);
-
-    std::vector<jni::jlong> ids;
-    ids.reserve(len);
-
-    for (std::size_t i = 0; i < len; i++) {
-        mbgl::LineAnnotation annotation = Polyline::toAnnotation(env, polylines.Get(env, i));
-        ids.push_back(map->addAnnotation(annotation));
-    }
-
-    auto result = jni::Array<jni::jlong>::New(env, len);
-    result.SetRegion<std::vector<jni::jlong>>(env, 0, ids);
-
-    return result;
-}
-
-
-jni::Local<jni::Array<jlong>> NativeMapView::addPolygons(JNIEnv& env, const jni::Array<jni::Object<Polygon>>& polygons) {
-    NullCheck(env, &polygons);
-    std::size_t len = polygons.Length(env);
-
-    std::vector<jni::jlong> ids;
-    ids.reserve(len);
-
-    for (std::size_t i = 0; i < len; i++) {
-        mbgl::FillAnnotation annotation = Polygon::toAnnotation(env, polygons.Get(env, i));
-        ids.push_back(map->addAnnotation(annotation));
-    }
-
-    auto result = jni::Array<jni::jlong>::New(env, len);
-    result.SetRegion<std::vector<jni::jlong>>(env, 0, ids);
-
-    return result;
-}
-
-void NativeMapView::updatePolyline(JNIEnv& env, jlong polylineId, const jni::Object<Polyline>& polyline) {
-    mbgl::LineAnnotation annotation = Polyline::toAnnotation(env, polyline);
-    map->updateAnnotation(polylineId, annotation);
-}
-
-void NativeMapView::updatePolygon(JNIEnv& env, jlong polygonId, const jni::Object<Polygon>& polygon) {
-    mbgl::FillAnnotation annotation = Polygon::toAnnotation(env, polygon);
-    map->updateAnnotation(polygonId, annotation);
-}
-
-void NativeMapView::removeAnnotations(JNIEnv& env, const jni::Array<jlong>& ids) {
-    NullCheck(env, &ids);
-    std::size_t len = ids.Length(env);
-    auto elements = jni::GetArrayElements(env, *ids);
-    jlong* jids = std::get<0>(elements).get();
-
-    for (std::size_t i = 0; i < len; i++) {
-        if(jids[i] == -1L) {
-          continue;
-        }
-        map->removeAnnotation(jids[i]);
-    }
-}
-
-void NativeMapView::addAnnotationIcon(JNIEnv& env, const jni::String& symbol, jint w, jint h, jfloat scale, const jni::Array<jbyte>& jpixels) {
-    const std::string symbolName = jni::Make<std::string>(env, symbol);
-
-    NullCheck(env, &jpixels);
-    std::size_t size = jpixels.Length(env);
-
-    mbgl::PremultipliedImage premultipliedImage({ static_cast<uint32_t>(w), static_cast<uint32_t>(h) });
-    if (premultipliedImage.bytes() != uint32_t(size)) {
-        throw mbgl::util::StyleImageException("Annotation icon image pixel count mismatch");
-    }
-
-    jni::GetArrayRegion(env, *jpixels, 0, size, reinterpret_cast<jbyte*>(premultipliedImage.data.get()));
-    map->addAnnotationImage(std::make_unique<mbgl::style::Image>(
-        symbolName, std::move(premultipliedImage), float(scale)));
-}
-
-void NativeMapView::removeAnnotationIcon(JNIEnv& env, const jni::String& symbol) {
-    const std::string symbolName = jni::Make<std::string>(env, symbol);
-    map->removeAnnotationImage(symbolName);
-}
-
-jdouble NativeMapView::getTopOffsetPixelsForAnnotationSymbol(JNIEnv& env, const jni::String& symbolName) {
-    return map->getTopOffsetPixelsForAnnotationImage(jni::Make<std::string>(env, symbolName));
-}
-
-jni::Local<jni::Object<TransitionOptions>> NativeMapView::getTransitionOptions(JNIEnv& env) {
-    const auto transitionOptions = map->getStyle().getTransitionOptions();
-    const auto duration = std::chrono::duration_cast<std::chrono::milliseconds>(transitionOptions.duration.value_or(mbgl::Duration::zero())).count();
-    const auto delay = std::chrono::duration_cast<std::chrono::milliseconds>(transitionOptions.delay.value_or(mbgl::Duration::zero())).count();
-    const auto enablePlacementTransitions = (jboolean) transitionOptions.enablePlacementTransitions;
-    return TransitionOptions::fromTransitionOptions(env, duration, delay, enablePlacementTransitions);
-}
-
-void NativeMapView::setTransitionOptions(JNIEnv& env, const jni::Object<TransitionOptions>& options) {
-    const mbgl::style::TransitionOptions transitionOptions(
-            Duration(mbgl::Milliseconds(TransitionOptions::getDuration(env, options))),
-            Duration(mbgl::Milliseconds(TransitionOptions::getDelay(env, options))),
-            TransitionOptions::isEnablePlacementTransitions(env, options)
-    );
-    map->getStyle().setTransitionOptions(transitionOptions);
-}
-
-jni::Local<jni::Array<jlong>> NativeMapView::queryPointAnnotations(JNIEnv& env, const jni::Object<RectF>& rect) {
-    using namespace mbgl::style;
-    using namespace mbgl::style::conversion;
-
-    // Convert input
-    mbgl::ScreenBox box = {
-        { RectF::getLeft(env, rect), RectF::getTop(env, rect) },
-        { RectF::getRight(env, rect), RectF::getBottom(env, rect) },
-    };
-
-    // Assume only points for now
-    mbgl::AnnotationIDs ids = rendererFrontend->queryPointAnnotations(box);
-
-    // Convert result
-    std::vector<jlong> longIds(ids.begin(), ids.end());
-    auto result = jni::Array<jni::jlong>::New(env, ids.size());
-    result.SetRegion<std::vector<jni::jlong>>(env, 0, longIds);
-
-    return result;
-}
-
-jni::Local<jni::Array<jlong>> NativeMapView::queryShapeAnnotations(JNIEnv& env, const jni::Object<RectF>& rect) {
-    using namespace mbgl::style;
-    using namespace mbgl::style::conversion;
-
-    // Convert input
-    mbgl::ScreenBox box = {
-         {RectF::getLeft(env, rect),  RectF::getTop(env, rect)},
-         {RectF::getRight(env, rect), RectF::getBottom(env, rect)},
-    };
-
-    mbgl::AnnotationIDs ids = rendererFrontend->queryShapeAnnotations(box);
-
-    // Convert result
-    std::vector<jlong> longIds(ids.begin(), ids.end());
-    auto result = jni::Array<jni::jlong>::New(env, ids.size());
-    result.SetRegion<std::vector<jni::jlong>>(env, 0, longIds);
-
-    return result;
-}
-
-jni::Local<jni::Array<jni::Object<geojson::Feature>>> NativeMapView::queryRenderedFeaturesForPoint(JNIEnv& env, jni::jfloat x, jni::jfloat y,
-                                                                              const jni::Array<jni::String>& layerIds,
-                                                                              const jni::Array<jni::Object<>>& jfilter) {
-    using namespace mbgl::android::conversion;
-    using namespace mbgl::android::geojson;
-
-    mbgl::optional<std::vector<std::string>> layers;
-    if (layerIds && layerIds.Length(env) > 0) {
-        layers = android::conversion::toVector(env, layerIds);
-    }
-    mapbox::geometry::point<double> point = {x, y};
-
-    return Feature::convert(
-            env,
-            rendererFrontend->queryRenderedFeatures(point, { layers, toFilter(env, jfilter) }));
-}
-
-jni::Local<jni::Array<jni::Object<geojson::Feature>>> NativeMapView::queryRenderedFeaturesForBox(JNIEnv& env, jni::jfloat left, jni::jfloat top,
-                                                                            jni::jfloat right, jni::jfloat bottom, const jni::Array<jni::String>& layerIds,
-                                                                            const jni::Array<jni::Object<>>& jfilter) {
-    using namespace mbgl::android::conversion;
-    using namespace mbgl::android::geojson;
-
-    mbgl::optional<std::vector<std::string>> layers;
-    if (layerIds && layerIds.Length(env) > 0) {
-        layers = toVector(env, layerIds);
-    }
-    mapbox::geometry::box<double> box = {
-            mapbox::geometry::point<double>{ left, top},
-            mapbox::geometry::point<double>{ right, bottom }
-    };
-
-    return Feature::convert(
-            env,
-            rendererFrontend->queryRenderedFeatures(box, { layers, toFilter(env, jfilter) }));
-}
-
-jni::Local<jni::Object<Light>> NativeMapView::getLight(JNIEnv& env) {
-    mbgl::style::Light* light = map->getStyle().getLight();
-    if (light) {
-        return Light::createJavaLightPeer(env, *map, *light);
-    } else {
-        return jni::Local<jni::Object<Light>>();
-    }
-}
-
-jni::Local<jni::Array<jni::Object<Layer>>> NativeMapView::getLayers(JNIEnv& env) {
-
-    // Get the core layers
-    std::vector<style::Layer*> layers = map->getStyle().getLayers();
-
-    // Convert
-    auto jLayers = jni::Array<jni::Object<Layer>>::New(env, layers.size());
-    int index = 0;
-    for (auto layer : layers) {
-        jLayers.Set(env, index, LayerManagerAndroid::get()->createJavaLayerPeer(env, *layer));
-        index++;
-    }
-
-    return jLayers;
-}
-
-jni::Local<jni::Object<Layer>> NativeMapView::getLayer(JNIEnv& env, const jni::String& layerId) {
-
-    // Find the layer
-    mbgl::style::Layer* coreLayer = map->getStyle().getLayer(jni::Make<std::string>(env, layerId));
-    if (!coreLayer) {
-       mbgl::Log::Debug(mbgl::Event::JNI, "No layer found");
-       return jni::Local<jni::Object<Layer>>();
-    }
-
-    // Create and return the layer's native peer
-    return LayerManagerAndroid::get()->createJavaLayerPeer(env, *coreLayer);
-}
-
-void NativeMapView::addLayer(JNIEnv& env, jlong nativeLayerPtr, const jni::String& before) {
-    assert(nativeLayerPtr != 0);
-
-    Layer *layer = reinterpret_cast<Layer *>(nativeLayerPtr);
-    try {
-        layer->addToStyle(
-            map->getStyle(),
-            before ? mbgl::optional<std::string>(jni::Make<std::string>(env, before)) : mbgl::optional<std::string>());
-    } catch (const std::runtime_error& error) {
-        jni::ThrowNew(env, jni::FindClass(env, "com/mapbox/mapboxsdk/style/layers/CannotAddLayerException"), error.what());
-    }
-}
-
-void NativeMapView::addLayerAbove(JNIEnv& env, jlong nativeLayerPtr, const jni::String& above) {
-    assert(nativeLayerPtr != 0);
-
-    Layer *layer = reinterpret_cast<Layer *>(nativeLayerPtr);
-
-    // Find the sibling
-    auto layers = map->getStyle().getLayers();
-    auto siblingId = jni::Make<std::string>(env, above);
-
-    size_t index = 0;
-    for (auto l : layers) {
-        if (l->getID() == siblingId) {
-            break;
-        }
-        index++;
-    }
-
-    // Check if we found a sibling to place before
-    mbgl::optional<std::string> before;
-    if (index + 1 > layers.size()) {
-        // Not found
-        jni::ThrowNew(env, jni::FindClass(env, "com/mapbox/mapboxsdk/style/layers/CannotAddLayerException"),
-            std::string("Could not find layer: ").append(siblingId).c_str());
-        return;
-    } else if (index + 1 < layers.size()) {
-        // Place before the sibling
-        before = { layers.at(index + 1)->getID() };
-    }
-
-    // Add the layer
-    try {
-        layer->addToStyle(map->getStyle(), before);
-    } catch (const std::runtime_error& error) {
-        jni::ThrowNew(env, jni::FindClass(env, "com/mapbox/mapboxsdk/style/layers/CannotAddLayerException"), error.what());
-    }
-}
-
-void NativeMapView::addLayerAt(JNIEnv& env, jlong nativeLayerPtr, jni::jint index) {
-    assert(nativeLayerPtr != 0);
-
-    Layer *layer = reinterpret_cast<Layer *>(nativeLayerPtr);
-    auto layers = map->getStyle().getLayers();
-
-    // Check index
-    int numLayers = layers.size() - 1;
-    if (index > numLayers || index < 0) {
-        Log::Error(Event::JNI, "Index out of range: %i", index);
-        jni::ThrowNew(env, jni::FindClass(env, "com/mapbox/mapboxsdk/style/layers/CannotAddLayerException"),
-            std::string("Invalid index").c_str());
-        return;
-    }
-
-    // Insert it below the current at that index
-    try {
-        layer->addToStyle(map->getStyle(), layers.at(index)->getID());
-    } catch (const std::runtime_error& error) {
-        jni::ThrowNew(env, jni::FindClass(env, "com/mapbox/mapboxsdk/style/layers/CannotAddLayerException"), error.what());
-    }
-}
-
-
-/**
- * Remove layer at index.
- */
-jni::jboolean NativeMapView::removeLayerAt(JNIEnv& env, jni::jint index) {
-    auto layers = map->getStyle().getLayers();
-
-    // Check index
-    int numLayers = layers.size() - 1;
-    if (index > numLayers || index < 0) {
-        Log::Warning(Event::JNI, "Index out of range: %i", index);
-        return jni::jni_false;
-    }
-
-    std::unique_ptr<mbgl::style::Layer> coreLayer = map->getStyle().removeLayer(layers.at(index)->getID());
-    if (coreLayer) {
-        jni::Local<jni::Object<Layer>> layerObj =
-            LayerManagerAndroid::get()->createJavaLayerPeer(env, std::move(coreLayer));
-        return jni::jni_true;
-    }
-    return jni::jni_false;
-}
-
-/**
- * Remove with wrapper object id. Ownership is transferred back to the wrapper
- */
-jni::jboolean NativeMapView::removeLayer(JNIEnv&, jlong layerPtr) {
-    assert(layerPtr != 0);
-
-    mbgl::android::Layer *layer = reinterpret_cast<mbgl::android::Layer *>(layerPtr);
-    std::unique_ptr<mbgl::style::Layer> coreLayer = map->getStyle().removeLayer(layer->get().getID());
-    if (coreLayer) {
-        layer->setLayer(std::move(coreLayer));
-        return jni::jni_true;
-    }
-    return jni::jni_false;
-}
-
-jni::Local<jni::Array<jni::Object<Source>>> NativeMapView::getSources(JNIEnv& env) {
-    // Get the core sources
-    std::vector<style::Source*> sources = map->getStyle().getSources();
-
-    // Convert
-    auto jSources = jni::Array<jni::Object<Source>>::New(env, sources.size());
-    int index = 0;
-    for (auto source : sources) {
-        jSources.Set(env, index, Source::peerForCoreSource(env, *source, *rendererFrontend));
-        index++;
-    }
-
-    return jSources;
-}
-
-jni::Local<jni::Object<Source>> NativeMapView::getSource(JNIEnv& env, const jni::String& sourceId) {
-    // Find the source
-    mbgl::style::Source* coreSource = map->getStyle().getSource(jni::Make<std::string>(env, sourceId));
-    if (!coreSource) {
-       mbgl::Log::Debug(mbgl::Event::JNI, "No source found");
-       return jni::Local<jni::Object<Source>>();
-    }
-
-    // Create and return the source's native peer
-    return jni::NewLocal(env, Source::peerForCoreSource(env, *coreSource, *rendererFrontend));
-}
-
-void NativeMapView::addSource(JNIEnv& env, const jni::Object<Source>& obj, jlong sourcePtr) {
-    assert(sourcePtr != 0);
-
-    Source *source = reinterpret_cast<Source *>(sourcePtr);
-    try {
-        source->addToMap(env, obj, *map, *rendererFrontend);
-    } catch (const std::runtime_error& error) {
-        jni::ThrowNew(env, jni::FindClass(env, "com/mapbox/mapboxsdk/style/sources/CannotAddSourceException"), error.what());
-    }
-}
-
-jni::jboolean NativeMapView::removeSource(JNIEnv& env, const jni::Object<Source>& obj, jlong sourcePtr) {
-    assert(sourcePtr != 0);
-
-    mbgl::android::Source *source = reinterpret_cast<mbgl::android::Source *>(sourcePtr);
-    if (source->removeFromMap(env, obj, *map)) {
-        source->releaseJavaPeer();
-        return jni::jni_true;
-    }
-
-    return jni::jni_false;
-}
-
-void NativeMapView::addImage(JNIEnv& env, const jni::String& name, const jni::Object<Bitmap>& bitmap, jni::jfloat scale, jni::jboolean sdf) {
-    jni::NullCheck(env, &bitmap);
-    mbgl::PremultipliedImage premultipliedImage = Bitmap::GetImage(env, bitmap);
-
-    map->getStyle().addImage(std::make_unique<mbgl::style::Image>(
-        jni::Make<std::string>(env, name),
-        std::move(premultipliedImage),
-        float(scale),
-        sdf)
-    );
-}
-
-void NativeMapView::addImages(JNIEnv& env, const jni::Array<jni::Object<mbgl::android::Image>>& jimages) {
-    jni::NullCheck(env, &jimages);
-    std::size_t len = jimages.Length(env);
-
-    for (std::size_t i = 0; i < len; i++) {
-        auto image = mbgl::android::Image::getImage(env, jimages.Get(env, i));
-        map->getStyle().addImage(std::make_unique<mbgl::style::Image>(image));
-    }
-}
-
-void NativeMapView::removeImage(JNIEnv& env, const jni::String& name) {
-    map->getStyle().removeImage(jni::Make<std::string>(env, name));
-}
-
-jni::Local<jni::Object<Bitmap>> NativeMapView::getImage(JNIEnv& env, const jni::String& name) {
-    if (auto image = map->getStyle().getImage(jni::Make<std::string>(env, name))) {
-        return Bitmap::CreateBitmap(env, image->getImage());
-    }
-    return jni::Local<jni::Object<Bitmap>>();
-}
-
-void NativeMapView::setPrefetchTiles(JNIEnv&, jni::jboolean enable) {
-    map->setPrefetchZoomDelta(enable ? util::DEFAULT_PREFETCH_ZOOM_DELTA : uint8_t(0));
-}
-
-jni::jboolean NativeMapView::getPrefetchTiles(JNIEnv&) {
-    return jni::jboolean(map->getPrefetchZoomDelta() > 0);
-}
-
-void NativeMapView::setPrefetchZoomDelta(JNIEnv&, jni::jint delta) {
-    map->setPrefetchZoomDelta(uint8_t(delta));
-}
-
-jni::jint NativeMapView::getPrefetchZoomDelta(JNIEnv&) {
-    return jni::jint(map->getPrefetchZoomDelta());
-}
-
-mbgl::Map& NativeMapView::getMap() {
-    return *map;
-}
-
-void NativeMapView::triggerRepaint(JNIEnv&) {
-    assert(map);
-    map->triggerRepaint();
-}
-
-// Static methods //
-
-void NativeMapView::registerNative(jni::JNIEnv& env) {
-    // Lookup the class
-    static auto& javaClass = jni::Class<NativeMapView>::Singleton(env);
-
-    #define METHOD(MethodPtr, name) jni::MakeNativePeerMethod<decltype(MethodPtr), (MethodPtr)>(name)
-
-    // Register the peer
-    jni::RegisterNativePeer<NativeMapView>(
-        env,
-        javaClass,
-        "nativePtr",
-        jni::MakePeer<NativeMapView,
-                      const jni::Object<NativeMapView>&,
-                      const jni::Object<FileSource>&,
-                      const jni::Object<MapRenderer>&,
-                      jni::jfloat,
-                      jni::jboolean>,
-        "nativeInitialize",
-        "nativeDestroy",
-        METHOD(&NativeMapView::resizeView, "nativeResizeView"),
-        METHOD(&NativeMapView::getStyleUrl, "nativeGetStyleUrl"),
-        METHOD(&NativeMapView::setStyleUrl, "nativeSetStyleUrl"),
-        METHOD(&NativeMapView::getStyleJson, "nativeGetStyleJson"),
-        METHOD(&NativeMapView::setStyleJson, "nativeSetStyleJson"),
-        METHOD(&NativeMapView::cancelTransitions, "nativeCancelTransitions"),
-        METHOD(&NativeMapView::setGestureInProgress, "nativeSetGestureInProgress"),
-        METHOD(&NativeMapView::moveBy, "nativeMoveBy"),
-        METHOD(&NativeMapView::jumpTo, "nativeJumpTo"),
-        METHOD(&NativeMapView::easeTo, "nativeEaseTo"),
-        METHOD(&NativeMapView::flyTo, "nativeFlyTo"),
-        METHOD(&NativeMapView::getLatLng, "nativeGetLatLng"),
-        METHOD(&NativeMapView::setLatLng, "nativeSetLatLng"),
-        METHOD(&NativeMapView::getCameraForLatLngBounds, "nativeGetCameraForLatLngBounds"),
-        METHOD(&NativeMapView::getCameraForGeometry, "nativeGetCameraForGeometry"),
-        METHOD(&NativeMapView::setReachability, "nativeSetReachability"),
-        METHOD(&NativeMapView::resetPosition, "nativeResetPosition"),
-        METHOD(&NativeMapView::getPitch, "nativeGetPitch"),
-        METHOD(&NativeMapView::setPitch, "nativeSetPitch"),
-        METHOD(&NativeMapView::getZoom, "nativeGetZoom"),
-        METHOD(&NativeMapView::setZoom, "nativeSetZoom"),
-        METHOD(&NativeMapView::resetZoom, "nativeResetZoom"),
-        METHOD(&NativeMapView::setMinZoom, "nativeSetMinZoom"),
-        METHOD(&NativeMapView::getMinZoom, "nativeGetMinZoom"),
-        METHOD(&NativeMapView::setMaxZoom, "nativeSetMaxZoom"),
-        METHOD(&NativeMapView::getMaxZoom, "nativeGetMaxZoom"),
-        METHOD(&NativeMapView::setMinPitch, "nativeSetMinPitch"),
-        METHOD(&NativeMapView::getMinPitch, "nativeGetMinPitch"),
-        METHOD(&NativeMapView::setMaxPitch, "nativeSetMaxPitch"),
-        METHOD(&NativeMapView::getMaxPitch, "nativeGetMaxPitch"),
-        METHOD(&NativeMapView::rotateBy, "nativeRotateBy"),
-        METHOD(&NativeMapView::setBearing, "nativeSetBearing"),
-        METHOD(&NativeMapView::setBearingXY, "nativeSetBearingXY"),
-        METHOD(&NativeMapView::getBearing, "nativeGetBearing"),
-        METHOD(&NativeMapView::resetNorth, "nativeResetNorth"),
-        METHOD(&NativeMapView::setVisibleCoordinateBounds, "nativeSetVisibleCoordinateBounds"),
-        METHOD(&NativeMapView::scheduleSnapshot, "nativeTakeSnapshot"),
-        METHOD(&NativeMapView::getCameraPosition, "nativeGetCameraPosition"),
-        METHOD(&NativeMapView::updateMarker, "nativeUpdateMarker"),
-        METHOD(&NativeMapView::addMarkers, "nativeAddMarkers"),
-        METHOD(&NativeMapView::setDebug, "nativeSetDebug"),
-        METHOD(&NativeMapView::getDebug, "nativeGetDebug"),
-        METHOD(&NativeMapView::isFullyLoaded, "nativeIsFullyLoaded"),
-        METHOD(&NativeMapView::onLowMemory, "nativeOnLowMemory"),
-        METHOD(&NativeMapView::getMetersPerPixelAtLatitude, "nativeGetMetersPerPixelAtLatitude"),
-        METHOD(&NativeMapView::projectedMetersForLatLng, "nativeProjectedMetersForLatLng"),
-        METHOD(&NativeMapView::pixelForLatLng, "nativePixelForLatLng"),
-        METHOD(&NativeMapView::pixelsForLatLngs, "nativePixelsForLatLngs"),
-        METHOD(&NativeMapView::getVisibleCoordinateBounds, "nativeGetVisibleCoordinateBounds"),
-        METHOD(&NativeMapView::latLngForProjectedMeters, "nativeLatLngForProjectedMeters"),
-        METHOD(&NativeMapView::latLngForPixel, "nativeLatLngForPixel"),
-        METHOD(&NativeMapView::latLngsForPixels, "nativeLatLngsForPixels"),
-        METHOD(&NativeMapView::addPolylines, "nativeAddPolylines"),
-        METHOD(&NativeMapView::addPolygons, "nativeAddPolygons"),
-        METHOD(&NativeMapView::updatePolyline, "nativeUpdatePolyline"),
-        METHOD(&NativeMapView::updatePolygon, "nativeUpdatePolygon"),
-        METHOD(&NativeMapView::removeAnnotations, "nativeRemoveAnnotations"),
-        METHOD(&NativeMapView::addAnnotationIcon, "nativeAddAnnotationIcon"),
-        METHOD(&NativeMapView::removeAnnotationIcon, "nativeRemoveAnnotationIcon"),
-        METHOD(&NativeMapView::getTopOffsetPixelsForAnnotationSymbol, "nativeGetTopOffsetPixelsForAnnotationSymbol"),
-        METHOD(&NativeMapView::getTransitionOptions, "nativeGetTransitionOptions"),
-        METHOD(&NativeMapView::setTransitionOptions, "nativeSetTransitionOptions"),
-        METHOD(&NativeMapView::queryPointAnnotations, "nativeQueryPointAnnotations"),
-        METHOD(&NativeMapView::queryShapeAnnotations, "nativeQueryShapeAnnotations"),
-        METHOD(&NativeMapView::queryRenderedFeaturesForPoint, "nativeQueryRenderedFeaturesForPoint"),
-        METHOD(&NativeMapView::queryRenderedFeaturesForBox, "nativeQueryRenderedFeaturesForBox"),
-        METHOD(&NativeMapView::getLight, "nativeGetLight"),
-        METHOD(&NativeMapView::getLayers, "nativeGetLayers"),
-        METHOD(&NativeMapView::getLayer, "nativeGetLayer"),
-        METHOD(&NativeMapView::addLayer, "nativeAddLayer"),
-        METHOD(&NativeMapView::addLayerAbove, "nativeAddLayerAbove"),
-        METHOD(&NativeMapView::addLayerAt, "nativeAddLayerAt"),
-        METHOD(&NativeMapView::removeLayerAt, "nativeRemoveLayerAt"),
-        METHOD(&NativeMapView::removeLayer, "nativeRemoveLayer"),
-        METHOD(&NativeMapView::getSources, "nativeGetSources"),
-        METHOD(&NativeMapView::getSource, "nativeGetSource"),
-        METHOD(&NativeMapView::addSource, "nativeAddSource"),
-        METHOD(&NativeMapView::removeSource, "nativeRemoveSource"),
-        METHOD(&NativeMapView::addImage, "nativeAddImage"),
-        METHOD(&NativeMapView::addImages, "nativeAddImages"),
-        METHOD(&NativeMapView::removeImage, "nativeRemoveImage"),
-        METHOD(&NativeMapView::getImage, "nativeGetImage"),
-        METHOD(&NativeMapView::setLatLngBounds, "nativeSetLatLngBounds"),
-        METHOD(&NativeMapView::setPrefetchTiles, "nativeSetPrefetchTiles"),
-        METHOD(&NativeMapView::getPrefetchTiles, "nativeGetPrefetchTiles"),
-        METHOD(&NativeMapView::setPrefetchZoomDelta, "nativeSetPrefetchZoomDelta"),
-        METHOD(&NativeMapView::getPrefetchZoomDelta, "nativeGetPrefetchZoomDelta"),
-        METHOD(&NativeMapView::triggerRepaint, "nativeTriggerRepaint"));
-}
-
-} // namespace android
-} // namespace mbgl
diff --git a/platform/android/src/native_map_view.hpp b/platform/android/src/native_map_view.hpp
deleted file mode 100644
index be632e242d..0000000000
--- a/platform/android/src/native_map_view.hpp
+++ /dev/null
@@ -1,279 +0,0 @@
-#pragma once
-
-#include <mbgl/map/change.hpp>
-#include <mbgl/map/camera.hpp>
-#include <mbgl/map/map.hpp>
-#include <mbgl/util/noncopyable.hpp>
-#include <mbgl/util/run_loop.hpp>
-#include <mbgl/storage/network_status.hpp>
-
-#include "annotation/marker.hpp"
-#include "annotation/polygon.hpp"
-#include "annotation/polyline.hpp"
-#include "graphics/pointf.hpp"
-#include "graphics/rectf.hpp"
-#include "geojson/feature.hpp"
-#include "geojson/geometry.hpp"
-#include "geometry/lat_lng.hpp"
-#include "geometry/projected_meters.hpp"
-#include "style/layers/layer_manager.hpp"
-#include "style/sources/source.hpp"
-#include "geometry/lat_lng_bounds.hpp"
-#include "map/camera_position.hpp"
-#include "map/image.hpp"
-#include "style/light.hpp"
-#include "bitmap.hpp"
-
-#include <exception>
-#include <string>
-#include <jni.h>
-#include <android/native_window.h>
-#include <EGL/egl.h>
-#include <jni/jni.hpp>
-
-namespace mbgl {
-namespace android {
-
-class AndroidRendererFrontend;
-class FileSource;
-class MapRenderer;
-
-class NativeMapView : public MapObserver {
-public:
-
-    static constexpr auto Name() { return "com/mapbox/mapboxsdk/maps/NativeMapView"; };
-
-    static void registerNative(jni::JNIEnv&);
-
-    NativeMapView(jni::JNIEnv&,
-                  const jni::Object<NativeMapView>&,
-                  const jni::Object<FileSource>&,
-                  const jni::Object<MapRenderer>&,
-                  jni::jfloat,
-                  jni::jboolean);
-
-    virtual ~NativeMapView();
-
-    // mbgl::RendererBackend (mbgl::MapObserver) //
-    void onCameraWillChange(MapObserver::CameraChangeMode) override;
-    void onCameraIsChanging() override;
-    void onCameraDidChange(MapObserver::CameraChangeMode) override;
-    void onWillStartLoadingMap() override;
-    void onDidFinishLoadingMap() override;
-    void onDidFailLoadingMap(MapLoadError, const std::string&) override;
-    void onWillStartRenderingFrame() override;
-    void onDidFinishRenderingFrame(MapObserver::RenderFrameStatus) override;
-    void onWillStartRenderingMap() override;
-    void onDidFinishRenderingMap(MapObserver::RenderMode) override;
-    void onDidBecomeIdle() override;
-    void onDidFinishLoadingStyle() override;
-    void onSourceChanged(mbgl::style::Source&) override;
-    void onStyleImageMissing(const std::string&) override;
-    bool onCanRemoveUnusedStyleImage(const std::string&) override;
-
-    // JNI //
-
-    void resizeView(jni::JNIEnv&, int, int);
-
-    jni::Local<jni::String> getStyleUrl(jni::JNIEnv&);
-
-    void setStyleUrl(jni::JNIEnv&, const jni::String&);
-
-    jni::Local<jni::String> getStyleJson(jni::JNIEnv&);
-
-    void setStyleJson(jni::JNIEnv&, const jni::String&);
-
-    void setLatLngBounds(jni::JNIEnv&, const jni::Object<mbgl::android::LatLngBounds>&);
-
-    void cancelTransitions(jni::JNIEnv&);
-
-    void setGestureInProgress(jni::JNIEnv&, jni::jboolean);
-
-    void moveBy(jni::JNIEnv&, jni::jdouble, jni::jdouble, jni::jlong);
-
-    void jumpTo(jni::JNIEnv&, jni::jdouble, jni::jdouble, jni::jdouble, jni::jdouble, jni::jdouble, const jni::Array<jni::jdouble>&);
-
-    void easeTo(jni::JNIEnv&, jni::jdouble, jni::jdouble, jni::jdouble, jni::jlong, jni::jdouble, jni::jdouble, const jni::Array<jni::jdouble>&, jni::jboolean);
-
-    void flyTo(jni::JNIEnv&, jni::jdouble, jni::jdouble, jni::jdouble, jni::jlong, jni::jdouble, jni::jdouble, const jni::Array<jni::jdouble>&);
-
-    jni::Local<jni::Object<LatLng>> getLatLng(JNIEnv&);
-
-    void setLatLng(jni::JNIEnv&, jni::jdouble, jni::jdouble, const jni::Array<jni::jdouble>&, jni::jlong);
-
-    jni::Local<jni::Object<CameraPosition>> getCameraForLatLngBounds(jni::JNIEnv&, const jni::Object<mbgl::android::LatLngBounds>&, double top, double left, double bottom, double right, double bearing, double tilt);
-
-    jni::Local<jni::Object<CameraPosition>> getCameraForGeometry(jni::JNIEnv&, const jni::Object<geojson::Geometry>&, double top, double left, double bottom, double right, double bearing, double tilt);
-
-    void setReachability(jni::JNIEnv&, jni::jboolean);
-
-    void resetPosition(jni::JNIEnv&);
-
-    jni::jdouble getPitch(jni::JNIEnv&);
-
-    void setPitch(jni::JNIEnv&, jni::jdouble, jni::jlong);
-
-    void setZoom(jni::JNIEnv&, jni::jdouble, jni::jdouble, jni::jdouble, jni::jlong);
-
-    jni::jdouble getZoom(jni::JNIEnv&);
-
-    void resetZoom(jni::JNIEnv&);
-
-    void setMinZoom(jni::JNIEnv&, jni::jdouble);
-
-    jni::jdouble getMinZoom(jni::JNIEnv&);
-
-    void setMaxZoom(jni::JNIEnv&, jni::jdouble);
-
-    jni::jdouble getMaxZoom(jni::JNIEnv&);
-
-    void setMinPitch(jni::JNIEnv&, jni::jdouble);
-
-    jni::jdouble getMinPitch(jni::JNIEnv&);
-
-    void setMaxPitch(jni::JNIEnv&, jni::jdouble);
-
-    jni::jdouble getMaxPitch(jni::JNIEnv&);
-
-    void rotateBy(jni::JNIEnv&, jni::jdouble, jni::jdouble, jni::jdouble, jni::jdouble, jni::jlong);
-
-    void setBearing(jni::JNIEnv&, jni::jdouble, jni::jlong);
-
-    void setBearingXY(jni::JNIEnv&, jni::jdouble, jni::jdouble, jni::jdouble, jni::jlong);
-
-    jni::jdouble getBearing(jni::JNIEnv&);
-
-    void resetNorth(jni::JNIEnv&);
-
-    void setVisibleCoordinateBounds(JNIEnv&, const jni::Array<jni::Object<LatLng>>&, const jni::Object<RectF>&, jni::jdouble, jni::jlong);
-
-    void getVisibleCoordinateBounds(JNIEnv& env, jni::Array<jdouble>& output);
-
-    void scheduleSnapshot(jni::JNIEnv&);
-
-    jni::Local<jni::Object<CameraPosition>> getCameraPosition(jni::JNIEnv&);
-
-    void updateMarker(jni::JNIEnv&, jni::jlong, jni::jdouble, jni::jdouble, const jni::String&);
-
-    jni::Local<jni::Array<jni::jlong>> addMarkers(jni::JNIEnv&, const jni::Array<jni::Object<Marker>>&);
-
-    void onLowMemory(JNIEnv& env);
-
-    void setDebug(JNIEnv&, jni::jboolean);
-
-    jni::jboolean getDebug(JNIEnv&);
-
-    jni::jboolean isFullyLoaded(JNIEnv&);
-
-    jni::jdouble getMetersPerPixelAtLatitude(JNIEnv&, jni::jdouble, jni::jdouble);
-
-    jni::Local<jni::Object<ProjectedMeters>> projectedMetersForLatLng(JNIEnv&, jni::jdouble, jni::jdouble);
-
-    jni::Local<jni::Object<PointF>> pixelForLatLng(JNIEnv&, jdouble, jdouble);
-
-    void pixelsForLatLngs(JNIEnv&, const jni::Array<jdouble>&, jni::Array<jdouble>&, jfloat);
-
-    jni::Local<jni::Object<LatLng>> latLngForProjectedMeters(JNIEnv&, jdouble, jdouble);
-
-    jni::Local<jni::Object<LatLng>> latLngForPixel(JNIEnv&, jfloat, jfloat);
-
-    void latLngsForPixels(JNIEnv&, const jni::Array<jdouble>&, jni::Array<jdouble>&, jfloat);
-
-    jni::Local<jni::Array<jlong>> addPolylines(JNIEnv&, const jni::Array<jni::Object<Polyline>>&);
-
-    jni::Local<jni::Array<jlong>> addPolygons(JNIEnv&, const jni::Array<jni::Object<Polygon>>&);
-
-    void updatePolyline(JNIEnv&, jlong, const jni::Object<Polyline>&);
-
-    void updatePolygon(JNIEnv&, jlong, const jni::Object<Polygon>&);
-
-    void removeAnnotations(JNIEnv&, const jni::Array<jlong>&);
-
-    void addAnnotationIcon(JNIEnv&, const jni::String&, jint, jint, jfloat, const jni::Array<jbyte>&);
-
-    void removeAnnotationIcon(JNIEnv&, const jni::String&);
-
-    jni::jdouble getTopOffsetPixelsForAnnotationSymbol(JNIEnv&, const jni::String&);
-
-    jni::Local<jni::Object<TransitionOptions>> getTransitionOptions(JNIEnv&);
-
-    void setTransitionOptions(JNIEnv&, const jni::Object<TransitionOptions>&);
-
-    jni::Local<jni::Array<jlong>> queryPointAnnotations(JNIEnv&, const jni::Object<RectF>&);
-
-    jni::Local<jni::Array<jlong>> queryShapeAnnotations(JNIEnv&, const jni::Object<RectF>&);
-
-    jni::Local<jni::Array<jni::Object<geojson::Feature>>> queryRenderedFeaturesForPoint(JNIEnv&, jni::jfloat, jni::jfloat,
-                                                                   const jni::Array<jni::String>&,
-                                                                   const jni::Array<jni::Object<>>& jfilter);
-
-    jni::Local<jni::Array<jni::Object<geojson::Feature>>> queryRenderedFeaturesForBox(JNIEnv&, jni::jfloat, jni::jfloat, jni::jfloat,
-                                                                 jni::jfloat, const jni::Array<jni::String>&,
-                                                                 const jni::Array<jni::Object<>>& jfilter);
-
-    jni::Local<jni::Object<Light>> getLight(JNIEnv&);
-
-    jni::Local<jni::Array<jni::Object<Layer>>> getLayers(JNIEnv&);
-
-    jni::Local<jni::Object<Layer>> getLayer(JNIEnv&, const jni::String&);
-
-    void addLayer(JNIEnv&, jlong, const jni::String&);
-
-    void addLayerAbove(JNIEnv&, jlong, const jni::String&);
-
-    void addLayerAt(JNIEnv&, jni::jlong, jni::jint);
-
-    jni::jboolean removeLayerAt(JNIEnv&, jni::jint);
-
-    jni::jboolean removeLayer(JNIEnv&, jlong);
-
-    jni::Local<jni::Array<jni::Object<Source>>> getSources(JNIEnv&);
-
-    jni::Local<jni::Object<Source>> getSource(JNIEnv&, const jni::String&);
-
-    void addSource(JNIEnv&, const jni::Object<Source>&, jlong nativePtr);
-
-    jni::jboolean removeSource(JNIEnv&, const jni::Object<Source>&, jlong nativePtr);
-
-    void addImage(JNIEnv&, const jni::String&, const jni::Object<Bitmap>& bitmap, jni::jfloat, jni::jboolean);
-
-    void addImages(JNIEnv&, const jni::Array<jni::Object<mbgl::android::Image>>&);
-
-    void removeImage(JNIEnv&, const jni::String&);
-
-    jni::Local<jni::Object<Bitmap>> getImage(JNIEnv&, const jni::String&);
-
-    void setPrefetchTiles(JNIEnv&, jni::jboolean);
-
-    jni::jboolean getPrefetchTiles(JNIEnv&);
-
-    void setPrefetchZoomDelta(JNIEnv&, jni::jint);
-
-    jni::jint getPrefetchZoomDelta(JNIEnv&);
-
-    mbgl::Map& getMap();
-
-    void triggerRepaint(JNIEnv&);
-
-private:
-    std::unique_ptr<AndroidRendererFrontend> rendererFrontend;
-
-    JavaVM *vm = nullptr;
-    jni::WeakReference<jni::Object<NativeMapView>> javaPeer;
-
-    MapRenderer& mapRenderer;
-
-    std::string styleUrl;
-
-    float pixelRatio;
-
-    // Minimum texture size according to OpenGL ES 2.0 specification.
-    int width = 64;
-    int height = 64;
-
-    // Ensure these are initialised last
-    std::unique_ptr<mbgl::Map> map;
-};
-
-} // namespace android
-} // namespace mbgl
diff --git a/platform/android/src/offline/offline_manager.cpp b/platform/android/src/offline/offline_manager.cpp
deleted file mode 100644
index 51d2f70fe0..0000000000
--- a/platform/android/src/offline/offline_manager.cpp
+++ /dev/null
@@ -1,335 +0,0 @@
-#include "offline_manager.hpp"
-
-#include <mbgl/storage/file_source_manager.hpp>
-#include <mbgl/storage/resource.hpp>
-#include <mbgl/util/string.hpp>
-
-#include "../attach_env.hpp"
-
-namespace mbgl {
-namespace android {
-
-namespace {
-// Reattach, the callback comes from a different thread
-void handleException(std::exception_ptr exception,
-                     const jni::Object<OfflineManager::FileSourceCallback>& callback,
-                     android::UniqueEnv env = android::AttachEnv()) {
-    if (exception) {
-        OfflineManager::FileSourceCallback::onError(
-            *env, callback, jni::Make<jni::String>(*env, mbgl::util::toString(exception)));
-    } else {
-        OfflineManager::FileSourceCallback::onSuccess(*env, callback);
-    }
-}
-} // namespace
-
-// OfflineManager //
-OfflineManager::OfflineManager(jni::JNIEnv& env, const jni::Object<FileSource>& jFileSource)
-    : fileSource(std::static_pointer_cast<mbgl::DatabaseFileSource>(
-          std::shared_ptr<mbgl::FileSource>(mbgl::FileSourceManager::get()->getFileSource(
-              mbgl::FileSourceType::Database, FileSource::getSharedResourceOptions(env, jFileSource))))) {
-    if (!fileSource) {
-        ThrowNew(env, jni::FindClass(env, "java/lang/IllegalStateException"), "Offline functionality is disabled.");
-    }
-}
-
-OfflineManager::~OfflineManager() {}
-
-void OfflineManager::setOfflineMapboxTileCountLimit(jni::JNIEnv&, jni::jlong limit) {
-    fileSource->setOfflineMapboxTileCountLimit(limit);
-}
-
-void OfflineManager::listOfflineRegions(jni::JNIEnv& env_, const jni::Object<FileSource>& jFileSource_, const jni::Object<ListOfflineRegionsCallback>& callback_) {
-    auto globalCallback = jni::NewGlobal<jni::EnvAttachingDeleter>(env_, callback_);
-    auto globalFilesource = jni::NewGlobal<jni::EnvAttachingDeleter>(env_, jFileSource_);
-
-    fileSource->listOfflineRegions([
-        //Keep a shared ptr to a global reference of the callback and file source so they are not GC'd in the meanwhile
-        callback = std::make_shared<decltype(globalCallback)>(std::move(globalCallback)),
-        jFileSource = std::make_shared<decltype(globalFilesource)>(std::move(globalFilesource))
-    ](mbgl::expected<mbgl::OfflineRegions, std::exception_ptr> regions) mutable {
-
-        // Reattach, the callback comes from a different thread
-        android::UniqueEnv env = android::AttachEnv();
-
-        if (regions) {
-            OfflineManager::ListOfflineRegionsCallback::onList(
-                *env, *jFileSource, *callback, *regions);
-        } else {
-            OfflineManager::ListOfflineRegionsCallback::onError(
-                *env, *callback, regions.error());
-        }
-    });
-}
-
-void OfflineManager::createOfflineRegion(jni::JNIEnv& env_,
-                                         const jni::Object<FileSource>& jFileSource_,
-                                         const jni::Object<OfflineRegionDefinition>& definition_,
-                                         const jni::Array<jni::jbyte>& metadata_,
-                                         const jni::Object<CreateOfflineRegionCallback>& callback_) {
-    // Convert
-    auto definition = OfflineRegionDefinition::getDefinition(env_, definition_);
-
-    mbgl::OfflineRegionMetadata metadata;
-    if (metadata_) {
-        metadata = OfflineRegion::metadata(env_, metadata_);
-    }
-
-    auto globalCallback = jni::NewGlobal<jni::EnvAttachingDeleter>(env_, callback_);
-    auto globalFilesource = jni::NewGlobal<jni::EnvAttachingDeleter>(env_, jFileSource_);
-
-    // Create region
-    fileSource->createOfflineRegion(definition, metadata, [
-        //Keep a shared ptr to a global reference of the callback and file source so they are not GC'd in the meanwhile
-        callback = std::make_shared<decltype(globalCallback)>(std::move(globalCallback)),
-        jFileSource = std::make_shared<decltype(globalFilesource)>(std::move(globalFilesource))
-    ](mbgl::expected<mbgl::OfflineRegion, std::exception_ptr> region) mutable {
-
-        // Reattach, the callback comes from a different thread
-        android::UniqueEnv env = android::AttachEnv();
-
-        if (region) {
-            OfflineManager::CreateOfflineRegionCallback::onCreate(
-                *env, *jFileSource, *callback, *region
-            );
-        } else {
-            OfflineManager::CreateOfflineRegionCallback::onError(
-                *env, *callback, region.error());
-        }
-    });
-}
-
-void OfflineManager::mergeOfflineRegions(jni::JNIEnv& env_, const jni::Object<FileSource>& jFileSource_,
-                                         const jni::String& jString_,
-                                         const jni::Object<MergeOfflineRegionsCallback>& callback_) {
-    auto globalCallback = jni::NewGlobal<jni::EnvAttachingDeleter>(env_, callback_);
-    auto globalFilesource = jni::NewGlobal<jni::EnvAttachingDeleter>(env_, jFileSource_);
-
-    auto path = jni::Make<std::string>(env_, jString_);
-    fileSource->mergeOfflineRegions(path, [
-        //Keep a shared ptr to a global reference of the callback and file source so they are not GC'd in the meanwhile
-        callback = std::make_shared<decltype(globalCallback)>(std::move(globalCallback)),
-        jFileSource = std::make_shared<decltype(globalFilesource)>(std::move(globalFilesource))
-    ](mbgl::expected<mbgl::OfflineRegions, std::exception_ptr> regions) mutable {
-
-        // Reattach, the callback comes from a different thread
-        android::UniqueEnv env = android::AttachEnv();
-
-        if (regions) {
-            OfflineManager::MergeOfflineRegionsCallback::onMerge(
-                *env, *jFileSource, *callback, *regions);
-        } else {
-            OfflineManager::MergeOfflineRegionsCallback::onError(
-                *env, *callback, regions.error());
-        }
-    });
-}
-
-void OfflineManager::resetDatabase(jni::JNIEnv& env_, const jni::Object<FileSourceCallback>& callback_) {
-    auto globalCallback = jni::NewGlobal<jni::EnvAttachingDeleter>(env_, callback_);
-
-    fileSource->resetDatabase(
-        [
-            // Keep a shared ptr to a global reference of the callback so they are not GC'd in the meanwhile
-            callback = std::make_shared<decltype(globalCallback)>(std::move(globalCallback))](
-            std::exception_ptr exception) mutable { handleException(exception, *callback); });
-}
-
-void OfflineManager::packDatabase(jni::JNIEnv& env_, const jni::Object<FileSourceCallback>& callback_) {
-    auto globalCallback = jni::NewGlobal<jni::EnvAttachingDeleter>(env_, callback_);
-
-    fileSource->packDatabase(
-        [
-            // Keep a shared ptr to a global reference of the callback so they are not GC'd in the meanwhile
-            callback = std::make_shared<decltype(globalCallback)>(std::move(globalCallback))](
-            std::exception_ptr exception) mutable { handleException(exception, *callback); });
-}
-
-void OfflineManager::invalidateAmbientCache(jni::JNIEnv& env_, const jni::Object<FileSourceCallback>& callback_) {
-    auto globalCallback = jni::NewGlobal<jni::EnvAttachingDeleter>(env_, callback_);
-
-    fileSource->invalidateAmbientCache(
-        [
-            // Keep a shared ptr to a global reference of the callback so they are not GC'd in the meanwhile
-            callback = std::make_shared<decltype(globalCallback)>(std::move(globalCallback))](
-            std::exception_ptr exception) mutable { handleException(exception, *callback); });
-}
-
-void OfflineManager::clearAmbientCache(jni::JNIEnv& env_, const jni::Object<FileSourceCallback>& callback_) {
-    auto globalCallback = jni::NewGlobal<jni::EnvAttachingDeleter>(env_, callback_);
-
-    fileSource->clearAmbientCache(
-        [
-            // Keep a shared ptr to a global reference of the callback so they are not GC'd in the meanwhile
-            callback = std::make_shared<decltype(globalCallback)>(std::move(globalCallback))](
-            std::exception_ptr exception) mutable { handleException(exception, *callback); });
-}
-
-void OfflineManager::setMaximumAmbientCacheSize(jni::JNIEnv& env_, const jni::jlong size_, const jni::Object<FileSourceCallback>& callback_) {
-    auto globalCallback = jni::NewGlobal<jni::EnvAttachingDeleter>(env_, callback_);
-
-    fileSource->setMaximumAmbientCacheSize(
-        size_,
-        [
-            // Keep a shared ptr to a global reference of the callback so they are not GC'd in the meanwhile
-            callback = std::make_shared<decltype(globalCallback)>(std::move(globalCallback))](
-            std::exception_ptr exception) mutable { handleException(exception, *callback); });
-}
-
-void OfflineManager::runPackDatabaseAutomatically(jni::JNIEnv&, jboolean autopack) {
-    fileSource->runPackDatabaseAutomatically(autopack);
-}
-
-// FileSource::FileSourceCallback //
-
-void OfflineManager::FileSourceCallback::onSuccess(jni::JNIEnv& env,
-                                               const jni::Object<OfflineManager::FileSourceCallback>& callback) {
-    static auto& javaClass = jni::Class<OfflineManager::FileSourceCallback>::Singleton(env);
-    static auto method = javaClass.GetMethod<void ()>(env, "onSuccess");
-    callback.Call(env, method);
-}
-
-void OfflineManager::FileSourceCallback::onError(jni::JNIEnv& env,
-                                             const jni::Object<OfflineManager::FileSourceCallback>& callback,
-                                             const jni::String& message) {
-    static auto& javaClass = jni::Class<OfflineManager::FileSourceCallback>::Singleton(env);
-    static auto method = javaClass.GetMethod<void (jni::String)>(env, "onError");
-    callback.Call(env, method, message);
-}
-
-void OfflineManager::registerNative(jni::JNIEnv& env) {
-    jni::Class<ListOfflineRegionsCallback>::Singleton(env);
-    jni::Class<CreateOfflineRegionCallback>::Singleton(env);
-    jni::Class<MergeOfflineRegionsCallback>::Singleton(env);
-    jni::Class<FileSourceCallback>::Singleton(env);
-
-    static auto& javaClass = jni::Class<OfflineManager>::Singleton(env);
-
-    #define METHOD(MethodPtr, name) jni::MakeNativePeerMethod<decltype(MethodPtr), (MethodPtr)>(name)
-
-    jni::RegisterNativePeer<OfflineManager>(
-        env,
-        javaClass,
-        "nativePtr",
-        jni::MakePeer<OfflineManager, const jni::Object<FileSource>&>,
-        "initialize",
-        "finalize",
-        METHOD(&OfflineManager::setOfflineMapboxTileCountLimit, "setOfflineMapboxTileCountLimit"),
-        METHOD(&OfflineManager::listOfflineRegions, "listOfflineRegions"),
-        METHOD(&OfflineManager::createOfflineRegion, "createOfflineRegion"),
-        METHOD(&OfflineManager::mergeOfflineRegions, "mergeOfflineRegions"),
-        METHOD(&OfflineManager::resetDatabase, "nativeResetDatabase"),
-        METHOD(&OfflineManager::packDatabase, "nativePackDatabase"),
-        METHOD(&OfflineManager::invalidateAmbientCache, "nativeInvalidateAmbientCache"),
-        METHOD(&OfflineManager::clearAmbientCache, "nativeClearAmbientCache"),
-        METHOD(&OfflineManager::setMaximumAmbientCacheSize, "nativeSetMaximumAmbientCacheSize"),
-        METHOD(&OfflineManager::runPackDatabaseAutomatically, "runPackDatabaseAutomatically"),
-        METHOD(&OfflineManager::putResourceWithUrl, "putResourceWithUrl"));
-}
-
-// OfflineManager::ListOfflineRegionsCallback //
-
-void OfflineManager::ListOfflineRegionsCallback::onError(jni::JNIEnv& env,
-                                                          const jni::Object<OfflineManager::ListOfflineRegionsCallback>& callback,
-                                                          std::exception_ptr error) {
-    static auto& javaClass = jni::Class<OfflineManager::ListOfflineRegionsCallback>::Singleton(env);
-    static auto method = javaClass.GetMethod<void (jni::String)>(env, "onError");
-
-    callback.Call(env, method, jni::Make<jni::String>(env, mbgl::util::toString(error)));
-}
-
-void OfflineManager::ListOfflineRegionsCallback::onList(jni::JNIEnv& env,
-                                                        const jni::Object<FileSource>& jFileSource,
-                                                        const jni::Object<OfflineManager::ListOfflineRegionsCallback>& callback,
-                                                        mbgl::OfflineRegions& regions) {
-    static auto& javaClass = jni::Class<OfflineManager::ListOfflineRegionsCallback>::Singleton(env);
-    static auto method = javaClass.GetMethod<void (jni::Array<jni::Object<OfflineRegion>>)>(env, "onList");
-
-    std::size_t index = 0;
-    auto jregions = jni::Array<jni::Object<OfflineRegion>>::New(env, regions.size());
-    for (auto& region : regions) {
-        jregions.Set(env, index, OfflineRegion::New(env, jFileSource, std::move(region)));
-        index++;
-    }
-
-    callback.Call(env, method, jregions);
-}
-
-// OfflineManager::CreateOfflineRegionCallback //
-
-void OfflineManager::CreateOfflineRegionCallback::onError(jni::JNIEnv& env,
-                                                          const jni::Object<OfflineManager::CreateOfflineRegionCallback>& callback,
-                                                          std::exception_ptr error) {
-    static auto& javaClass = jni::Class<OfflineManager::CreateOfflineRegionCallback>::Singleton(env);
-    static auto method = javaClass.GetMethod<void (jni::String)>(env, "onError");
-
-    callback.Call(env, method, jni::Make<jni::String>(env, mbgl::util::toString(error)));
-}
-
-void OfflineManager::CreateOfflineRegionCallback::onCreate(jni::JNIEnv& env,
-                                                        const jni::Object<FileSource>& jFileSource,
-                                                        const jni::Object<OfflineManager::CreateOfflineRegionCallback>& callback,
-                                                        mbgl::OfflineRegion& region) {
-    static auto& javaClass = jni::Class<OfflineManager::CreateOfflineRegionCallback>::Singleton(env);
-    static auto method = javaClass.GetMethod<void (jni::Object<OfflineRegion>)>(env, "onCreate");
-
-    callback.Call(env, method, OfflineRegion::New(env, jFileSource, std::move(region)));
-}
-
-// OfflineManager::MergeOfflineRegionsCallback //
-
-void OfflineManager::MergeOfflineRegionsCallback::onError(jni::JNIEnv& env,
-                                                          const jni::Object<OfflineManager::MergeOfflineRegionsCallback>& callback,
-                                                          std::exception_ptr error) {
-    static auto& javaClass = jni::Class<OfflineManager::MergeOfflineRegionsCallback>::Singleton(env);
-    static auto method = javaClass.GetMethod<void (jni::String)>(env, "onError");
-
-    callback.Call(env, method, jni::Make<jni::String>(env, mbgl::util::toString(error)));
-}
-
-void OfflineManager::MergeOfflineRegionsCallback::onMerge(jni::JNIEnv& env,
-                                                          const jni::Object<FileSource>& jFileSource,
-                                                          const jni::Object<MergeOfflineRegionsCallback>& callback,
-                                                          mbgl::OfflineRegions& regions) {
-    static auto& javaClass = jni::Class<OfflineManager::MergeOfflineRegionsCallback>::Singleton(env);
-    static auto method = javaClass.GetMethod<void (jni::Array<jni::Object<OfflineRegion>>)>(env, "onMerge");
-
-    std::size_t index = 0;
-    auto jregions = jni::Array<jni::Object<OfflineRegion>>::New(env, regions.size());
-    for (auto& region : regions) {
-        jregions.Set(env, index, OfflineRegion::New(env, jFileSource, std::move(region)));
-        index++;
-    }
-
-    callback.Call(env, method, jregions);
-}
-
-void OfflineManager::putResourceWithUrl(jni::JNIEnv& env,
-                                        const jni::String& url_,
-                                        const jni::Array<jni::jbyte>& arr,
-                                        jlong modified,
-                                        jlong expires,
-                                        const jni::String& eTag_,
-                                        jboolean mustRevalidate) {
-    auto url =  jni::Make<std::string>(env, url_);
-    auto data = std::make_shared<std::string>(arr.Length(env), char());
-    jni::GetArrayRegion(env, *arr, 0, data->size(), reinterpret_cast<jbyte*>(&(*data)[0]));
-    mbgl::Resource resource(mbgl::Resource::Kind::Unknown, url);
-    mbgl::Response response;
-    response.data = data;
-    response.mustRevalidate = mustRevalidate;
-    if (eTag_) {
-        response.etag = jni::Make<std::string>(env, eTag_);
-    }
-    if (modified > 0) {
-        response.modified = Timestamp(mbgl::Seconds(modified));
-    }
-    if (expires > 0) {
-        response.expires = Timestamp(mbgl::Seconds(expires));
-    }
-
-    fileSource->put(resource, response);
-}
-
-} // namespace android
-} // namespace mbgl
diff --git a/platform/android/src/offline/offline_manager.hpp b/platform/android/src/offline/offline_manager.hpp
deleted file mode 100644
index 84111a7423..0000000000
--- a/platform/android/src/offline/offline_manager.hpp
+++ /dev/null
@@ -1,111 +0,0 @@
-#pragma once
-
-#include <mbgl/storage/offline.hpp>
-#include <jni/jni.hpp>
-
-#include "../file_source.hpp"
-#include "offline_region.hpp"
-#include "offline_region_definition.hpp"
-#include "../java_types.hpp"
-
-#include <memory>
-
-namespace mbgl {
-
-namespace android {
-
-class OfflineManager {
-public:
-
-    class ListOfflineRegionsCallback {
-    public:
-        static constexpr auto Name() { return "com/mapbox/mapboxsdk/offline/OfflineManager$ListOfflineRegionsCallback";}
-
-        static void onError(jni::JNIEnv&, const jni::Object<OfflineManager::ListOfflineRegionsCallback>&, std::exception_ptr);
-
-        static void onList(jni::JNIEnv&,
-                            const jni::Object<FileSource>&,
-                            const jni::Object<OfflineManager::ListOfflineRegionsCallback>&,
-                            mbgl::OfflineRegions&);
-    };
-
-    class CreateOfflineRegionCallback {
-    public:
-        static constexpr auto Name() { return "com/mapbox/mapboxsdk/offline/OfflineManager$CreateOfflineRegionCallback"; }
-
-        static void onError(jni::JNIEnv&, const jni::Object<OfflineManager::CreateOfflineRegionCallback>&, std::exception_ptr);
-
-        static void onCreate(jni::JNIEnv&,
-                            const jni::Object<FileSource>&,
-                            const jni::Object<OfflineManager::CreateOfflineRegionCallback>&,
-                            mbgl::OfflineRegion&);
-    };
-
-    class MergeOfflineRegionsCallback {
-    public:
-        static constexpr auto Name() { return "com/mapbox/mapboxsdk/offline/OfflineManager$MergeOfflineRegionsCallback";}
-
-        static void onError(jni::JNIEnv&, const jni::Object<OfflineManager::MergeOfflineRegionsCallback>&, std::exception_ptr);
-
-        static void onMerge(jni::JNIEnv&,
-                            const jni::Object<FileSource>&,
-                            const jni::Object<MergeOfflineRegionsCallback>&,
-                            mbgl::OfflineRegions&);
-    };
-
-    struct FileSourceCallback {
-        static constexpr auto Name() { return "com/mapbox/mapboxsdk/offline/OfflineManager$FileSourceCallback";}
-
-        static void onSuccess(jni::JNIEnv&, const jni::Object<OfflineManager::FileSourceCallback>&);
-
-        static void onError(jni::JNIEnv&, const jni::Object<OfflineManager::FileSourceCallback>&, const jni::String&);
-    };
-
-    static constexpr auto Name() { return "com/mapbox/mapboxsdk/offline/OfflineManager"; };
-
-    static void registerNative(jni::JNIEnv&);
-
-    OfflineManager(jni::JNIEnv&, const jni::Object<FileSource>&);
-    ~OfflineManager();
-
-    void setOfflineMapboxTileCountLimit(jni::JNIEnv&, jni::jlong limit);
-
-    void listOfflineRegions(jni::JNIEnv&, const jni::Object<FileSource>&, const jni::Object<ListOfflineRegionsCallback>& callback);
-
-    void createOfflineRegion(jni::JNIEnv&,
-                             const jni::Object<FileSource>& jFileSource_,
-                             const jni::Object<OfflineRegionDefinition>& definition,
-                             const jni::Array<jni::jbyte>& metadata,
-                             const jni::Object<OfflineManager::CreateOfflineRegionCallback>& callback);
-
-    void mergeOfflineRegions(jni::JNIEnv&,
-                             const jni::Object<FileSource>&,
-                             const jni::String&,
-                             const jni::Object<MergeOfflineRegionsCallback>&);
-
-    void putResourceWithUrl(jni::JNIEnv&,
-                            const jni::String& url,
-                            const jni::Array<jni::jbyte>& data,
-                            jlong modified,
-                            jlong expires,
-                            const jni::String& eTag,
-                            jboolean mustRevalidate);
-
-    void resetDatabase(jni::JNIEnv&, const jni::Object<FileSourceCallback>& callback_);
-
-    void packDatabase(jni::JNIEnv&, const jni::Object<FileSourceCallback>& callback_);
-
-    void invalidateAmbientCache(jni::JNIEnv&, const jni::Object<FileSourceCallback>& callback_);
-
-    void clearAmbientCache(jni::JNIEnv&, const jni::Object<FileSourceCallback>& callback_);
-
-    void setMaximumAmbientCacheSize(jni::JNIEnv&, const jni::jlong size, const jni::Object<FileSourceCallback>& callback_);
-
-    void runPackDatabaseAutomatically(jni::JNIEnv&, jboolean autopack);
-
-private:
-    std::shared_ptr<mbgl::DatabaseFileSource> fileSource;
-};
-
-} // namespace android
-} // namespace mbgl
diff --git a/platform/android/src/offline/offline_region.cpp b/platform/android/src/offline/offline_region.cpp
deleted file mode 100644
index b1cdc56f79..0000000000
--- a/platform/android/src/offline/offline_region.cpp
+++ /dev/null
@@ -1,314 +0,0 @@
-#include "offline_region.hpp"
-
-#include <mbgl/storage/file_source_manager.hpp>
-#include <mbgl/util/logging.hpp>
-#include <mbgl/util/string.hpp>
-
-#include "offline_region_definition.hpp"
-#include "offline_region_error.hpp"
-#include "offline_region_status.hpp"
-#include "../attach_env.hpp"
-
-namespace mbgl {
-namespace android {
-
-// OfflineRegion //
-
-OfflineRegion::OfflineRegion(jni::JNIEnv& env, jni::jlong offlineRegionPtr, const jni::Object<FileSource>& jFileSource)
-    : region(reinterpret_cast<mbgl::OfflineRegion*>(offlineRegionPtr)),
-      fileSource(std::static_pointer_cast<mbgl::DatabaseFileSource>(
-          std::shared_ptr<mbgl::FileSource>(mbgl::FileSourceManager::get()->getFileSource(
-              mbgl::FileSourceType::Database, FileSource::getSharedResourceOptions(env, jFileSource))))) {
-    if (!fileSource) {
-        ThrowNew(env, jni::FindClass(env, "java/lang/IllegalStateException"), "Offline functionality is disabled.");
-    }
-}
-
-OfflineRegion::~OfflineRegion() {}
-
-void OfflineRegion::setOfflineRegionObserver(jni::JNIEnv& env_, const jni::Object<OfflineRegion::OfflineRegionObserver>& callback) {
-
-    // Define the observer
-    class Observer : public mbgl::OfflineRegionObserver {
-    public:
-        Observer(jni::Global<jni::Object<OfflineRegion::OfflineRegionObserver>, jni::EnvAttachingDeleter> callback_)
-            : callback(std::move(callback_)) {
-        }
-
-        void statusChanged(mbgl::OfflineRegionStatus status) override {
-            // Reattach, the callback comes from a different thread
-            android::UniqueEnv env = android::AttachEnv();
-
-            static auto& javaClass = jni::Class<OfflineRegion::OfflineRegionObserver>::Singleton(*env);
-            static auto method = javaClass.GetMethod<void (jni::Object<OfflineRegionStatus>)>(*env, "onStatusChanged");
-
-            callback.Call(*env, method, OfflineRegionStatus::New(*env, status));
-        }
-
-        void responseError(mbgl::Response::Error error) override {
-            // Reattach, the callback comes from a different thread
-            android::UniqueEnv env = android::AttachEnv();
-
-            static auto& javaClass = jni::Class<OfflineRegion::OfflineRegionObserver>::Singleton(*env);
-            static auto method = javaClass.GetMethod<void (jni::Object<mbgl::android::OfflineRegionError>)>(*env, "onError");
-
-            callback.Call(*env, method, OfflineRegionError::New(*env, error));
-        }
-
-        void mapboxTileCountLimitExceeded(uint64_t limit) override {
-            // Reattach, the callback comes from a different thread
-            android::UniqueEnv env = android::AttachEnv();
-
-            static auto& javaClass = jni::Class<OfflineRegion::OfflineRegionObserver>::Singleton(*env);
-            static auto method = javaClass.GetMethod<void (jni::jlong)>(*env, "mapboxTileCountLimitExceeded");
-
-            callback.Call(*env, method, jlong(limit));
-        }
-
-        jni::Global<jni::Object<OfflineRegion::OfflineRegionObserver>, jni::EnvAttachingDeleter> callback;
-    };
-
-    // Set the observer
-    fileSource->setOfflineRegionObserver(*region, std::make_unique<Observer>(jni::NewGlobal<jni::EnvAttachingDeleter>(env_, callback)));
-}
-
-void OfflineRegion::setOfflineRegionDownloadState(jni::JNIEnv&, jni::jint jState) {
-    // State
-    mbgl::OfflineRegionDownloadState state;
-    switch (jState) {
-        case 0:
-          state = mbgl::OfflineRegionDownloadState::Inactive;
-          break;
-        case 1:
-          state = mbgl::OfflineRegionDownloadState::Active;
-          break;
-        default:
-          mbgl::Log::Error(mbgl::Event::JNI, "State can only be 0 (inactive) or 1 (active).");
-          return;
-    }
-
-    fileSource->setOfflineRegionDownloadState(*region, state);
-}
-
-void OfflineRegion::getOfflineRegionStatus(jni::JNIEnv& env_, const jni::Object<OfflineRegionStatusCallback>& callback_) {
-    auto globalCallback = jni::NewGlobal<jni::EnvAttachingDeleter>(env_, callback_);
-
-    fileSource->getOfflineRegionStatus(*region, [
-        //Ensure the object is not gc'd in the meanwhile
-        callback = std::make_shared<decltype(globalCallback)>(std::move(globalCallback))
-    ](mbgl::expected<mbgl::OfflineRegionStatus, std::exception_ptr> status) mutable {
-        // Reattach, the callback comes from a different thread
-        android::UniqueEnv env = android::AttachEnv();
-
-        if (status) {
-            OfflineRegionStatusCallback::onStatus(*env, *callback, std::move(*status));
-        } else {
-            OfflineRegionStatusCallback::onError(*env, *callback, status.error());
-        }
-    });
-}
-
-void OfflineRegion::deleteOfflineRegion(jni::JNIEnv& env_, const jni::Object<OfflineRegionDeleteCallback>& callback_) {
-    auto globalCallback = jni::NewGlobal<jni::EnvAttachingDeleter>(env_, callback_);
-
-    fileSource->deleteOfflineRegion(*region,
-                                    [
-                                        // Ensure the object is not gc'd in the meanwhile
-                                        callback = std::make_shared<decltype(globalCallback)>(
-                                            std::move(globalCallback))](std::exception_ptr error) mutable {
-                                        // Reattach, the callback comes from a different thread
-                                        android::UniqueEnv env = android::AttachEnv();
-
-                                        if (error) {
-                                            OfflineRegionDeleteCallback::onError(*env, *callback, error);
-                                        } else {
-                                            OfflineRegionDeleteCallback::onDelete(*env, *callback);
-                                        }
-                                    });
-}
-
-void OfflineRegion::invalidateOfflineRegion(jni::JNIEnv& env_,
-                                            const jni::Object<OfflineRegionInvalidateCallback>& callback_) {
-    auto globalCallback = jni::NewGlobal<jni::EnvAttachingDeleter>(env_, callback_);
-
-    fileSource->invalidateOfflineRegion(*region,
-                                        [
-                                            // Ensure the object is not gc'd in the meanwhile
-                                            callback = std::make_shared<decltype(globalCallback)>(
-                                                std::move(globalCallback))](std::exception_ptr error) mutable {
-                                            // Reattach, the callback comes from a different thread
-                                            android::UniqueEnv env = android::AttachEnv();
-
-                                            if (error) {
-                                                OfflineRegionInvalidateCallback::onError(*env, *callback, error);
-                                            } else {
-                                                OfflineRegionInvalidateCallback::onInvalidate(*env, *callback);
-                                            }
-                                        });
-}
-
-void OfflineRegion::updateOfflineRegionMetadata(jni::JNIEnv& env_, const jni::Array<jni::jbyte>& jMetadata, const jni::Object<OfflineRegionUpdateMetadataCallback>& callback_) {
-    auto metadata = OfflineRegion::metadata(env_, jMetadata);
-    auto globalCallback = jni::NewGlobal<jni::EnvAttachingDeleter>(env_, callback_);
-
-    fileSource->updateOfflineMetadata(region->getID(), metadata, [
-        //Ensure the object is not gc'd in the meanwhile
-        callback = std::make_shared<decltype(globalCallback)>(std::move(globalCallback))
-    ](mbgl::expected<mbgl::OfflineRegionMetadata, std::exception_ptr> data) mutable {
-        // Reattach, the callback comes from a different thread
-        android::UniqueEnv env = android::AttachEnv();
-
-        if (data) {
-            OfflineRegionUpdateMetadataCallback::onUpdate(*env, *callback, std::move(*data));
-        } else {
-            OfflineRegionUpdateMetadataCallback::onError(*env, *callback, data.error());
-        }
-    });
-}
-
-jni::Local<jni::Object<OfflineRegion>> OfflineRegion::New(jni::JNIEnv& env,
-                                                          const jni::Object<FileSource>& jFileSource,
-                                                          mbgl::OfflineRegion region) {
-    // Definition
-    auto definition = region.getDefinition().match(
-        [&](const mbgl::OfflineTilePyramidRegionDefinition def) {
-            return OfflineTilePyramidRegionDefinition::New(env, def);
-        },
-        [&](const mbgl::OfflineGeometryRegionDefinition def) {
-            return OfflineGeometryRegionDefinition::New(env, def);
-        });
-
-    // Create region java object
-    static auto& javaClass = jni::Class<OfflineRegion>::Singleton(env);
-    static auto constructor = javaClass.GetConstructor<jni::jlong, jni::Object<FileSource>, jni::jlong, jni::Object<OfflineRegionDefinition>, jni::Array<jni::jbyte>>(env);
-
-    return javaClass.New(env, constructor,
-        reinterpret_cast<jni::jlong>(new mbgl::OfflineRegion(std::move(region))), //Copy a region to the heap
-        jFileSource,
-        jni::jlong(region.getID()),
-        definition,
-        OfflineRegion::metadata(env, region.getMetadata()));
-}
-
-jni::Local<jni::Array<jni::jbyte>> OfflineRegion::metadata(jni::JNIEnv& env, mbgl::OfflineRegionMetadata metadata_) {
-    std::vector<jni::jbyte> convertedMetadata(metadata_.begin(), metadata_.end());
-    std::size_t length = static_cast<std::size_t>(convertedMetadata.size());
-    auto metadata = jni::Array<jni::jbyte>::New(env, length);
-    metadata.SetRegion<std::vector<jni::jbyte>>(env, 0, convertedMetadata);
-    return metadata;
-}
-
-mbgl::OfflineRegionMetadata OfflineRegion::metadata(jni::JNIEnv& env, const jni::Array<jni::jbyte>& metadata_) {
-    std::size_t length = metadata_.Length(env);
-    auto metadata_tmp = std::vector<jni::jbyte>();
-    metadata_tmp.resize(length);
-    metadata_.GetRegion<std::vector<jni::jbyte>>(env, 0, metadata_tmp);
-    auto metadata = std::vector<uint8_t>(metadata_tmp.begin(), metadata_tmp.end());
-    return metadata;
-}
-
-void OfflineRegion::registerNative(jni::JNIEnv& env) {
-    jni::Class<OfflineRegionObserver>::Singleton(env);
-    jni::Class<OfflineRegionStatusCallback>::Singleton(env);
-    jni::Class<OfflineRegionDeleteCallback>::Singleton(env);
-    jni::Class<OfflineRegionUpdateMetadataCallback>::Singleton(env);
-    jni::Class<OfflineRegionInvalidateCallback>::Singleton(env);
-
-    static auto& javaClass = jni::Class<OfflineRegion>::Singleton(env);
-
-    #define METHOD(MethodPtr, name) jni::MakeNativePeerMethod<decltype(MethodPtr), (MethodPtr)>(name)
-
-    jni::RegisterNativePeer<OfflineRegion>(
-        env,
-        javaClass,
-        "nativePtr",
-        jni::MakePeer<OfflineRegion, jni::jlong, const jni::Object<FileSource>&>,
-        "initialize",
-        "finalize",
-        METHOD(&OfflineRegion::setOfflineRegionObserver, "setOfflineRegionObserver"),
-        METHOD(&OfflineRegion::setOfflineRegionDownloadState, "setOfflineRegionDownloadState"),
-        METHOD(&OfflineRegion::getOfflineRegionStatus, "getOfflineRegionStatus"),
-        METHOD(&OfflineRegion::deleteOfflineRegion, "deleteOfflineRegion"),
-        METHOD(&OfflineRegion::invalidateOfflineRegion, "invalidateOfflineRegion"),
-        METHOD(&OfflineRegion::updateOfflineRegionMetadata, "updateOfflineRegionMetadata"));
-}
-
-// OfflineRegionObserver //
-
-// OfflineRegionStatusCallback //
-
-void OfflineRegion::OfflineRegionStatusCallback::onError(jni::JNIEnv& env,
-                                                          const jni::Object<OfflineRegion::OfflineRegionStatusCallback>& callback,
-                                                          std::exception_ptr error) {
-    static auto& javaClass = jni::Class<OfflineRegion::OfflineRegionStatusCallback>::Singleton(env);
-    static auto method = javaClass.GetMethod<void(jni::String)>(env, "onError");
-
-    callback.Call(env, method, jni::Make<jni::String>(env, mbgl::util::toString(error)));
-}
-
-void OfflineRegion::OfflineRegionStatusCallback::onStatus(jni::JNIEnv& env,
-                                                        const jni::Object<OfflineRegion::OfflineRegionStatusCallback>& callback,
-                                                        mbgl::optional<mbgl::OfflineRegionStatus> status) {
-    static auto& javaClass = jni::Class<OfflineRegion::OfflineRegionStatusCallback>::Singleton(env);
-    static auto method = javaClass.GetMethod<void (jni::Object<OfflineRegionStatus>)>(env, "onStatus");
-
-    callback.Call(env, method, OfflineRegionStatus::New(env, std::move(*status)));
-}
-
-// OfflineRegionDeleteCallback //
-
-void OfflineRegion::OfflineRegionDeleteCallback::onError(jni::JNIEnv& env,
-                                                          const jni::Object<OfflineRegion::OfflineRegionDeleteCallback>& callback,
-                                                          std::exception_ptr error) {
-    static auto& javaClass = jni::Class<OfflineRegion::OfflineRegionDeleteCallback>::Singleton(env);
-    static auto method = javaClass.GetMethod<void (jni::String)>(env, "onError");
-
-    callback.Call(env, method, jni::Make<jni::String>(env, mbgl::util::toString(error)));
-}
-
-void OfflineRegion::OfflineRegionDeleteCallback::onDelete(jni::JNIEnv& env, const jni::Object<OfflineRegion::OfflineRegionDeleteCallback>& callback) {
-    // Trigger callback
-    static auto& javaClass = jni::Class<OfflineRegion::OfflineRegionDeleteCallback>::Singleton(env);
-    static auto method = javaClass.GetMethod<void ()>(env, "onDelete");
-
-    callback.Call(env, method);
-}
-
-// OfflineRegionUpdateMetadataCallback //
-
-void OfflineRegion::OfflineRegionUpdateMetadataCallback::onError(jni::JNIEnv& env,
-                                                          const jni::Object<OfflineRegion::OfflineRegionUpdateMetadataCallback>& callback,
-                                                          std::exception_ptr error) {
-    static auto& javaClass = jni::Class<OfflineRegion::OfflineRegionUpdateMetadataCallback>::Singleton(env);
-    static auto method = javaClass.GetMethod<void (jni::String)>(env, "onError");
-
-    callback.Call(env, method, jni::Make<jni::String>(env, mbgl::util::toString(error)));
-}
-
-void OfflineRegion::OfflineRegionUpdateMetadataCallback::onUpdate(jni::JNIEnv& env,
-                                                        const jni::Object<OfflineRegion::OfflineRegionUpdateMetadataCallback>& callback,
-                                                        mbgl::optional<mbgl::OfflineRegionMetadata> metadata) {
-    static auto& javaClass = jni::Class<OfflineRegion::OfflineRegionUpdateMetadataCallback>::Singleton(env);
-    static auto method = javaClass.GetMethod<void (jni::Array<jni::jbyte>)>(env, "onUpdate");
-
-    callback.Call(env, method, OfflineRegion::metadata(env, std::move(*metadata)));
-}
-
-// OfflineRegionInvalidateCallback //
-
-void OfflineRegion::OfflineRegionInvalidateCallback::onError(jni::JNIEnv& env,
-                                                          const jni::Object<OfflineRegion::OfflineRegionInvalidateCallback>& callback,
-                                                          std::exception_ptr error) {
-    static auto& javaClass = jni::Class<OfflineRegion::OfflineRegionInvalidateCallback>::Singleton(env);
-    static auto method = javaClass.GetMethod<void (jni::String)>(env, "onError");
-    callback.Call(env, method, jni::Make<jni::String>(env, mbgl::util::toString(error)));
-}
-
-void OfflineRegion::OfflineRegionInvalidateCallback::onInvalidate(jni::JNIEnv& env, const jni::Object<OfflineRegion::OfflineRegionInvalidateCallback>& callback) {
-    static auto& javaClass = jni::Class<OfflineRegion::OfflineRegionInvalidateCallback>::Singleton(env);
-    static auto method = javaClass.GetMethod<void ()>(env, "onInvalidate");
-    callback.Call(env, method);
-}
-
-} // namespace android
-} // namespace mbgl
diff --git a/platform/android/src/offline/offline_region.hpp b/platform/android/src/offline/offline_region.hpp
deleted file mode 100644
index 6844008bb4..0000000000
--- a/platform/android/src/offline/offline_region.hpp
+++ /dev/null
@@ -1,92 +0,0 @@
-#pragma once
-
-#include <mbgl/storage/offline.hpp>
-#include <jni/jni.hpp>
-
-#include "../file_source.hpp"
-
-#include <memory>
-
-namespace mbgl {
-namespace android {
-
-class OfflineRegion {
-public:
-    class OfflineRegionObserver {
-    public:
-        static constexpr auto Name() { return "com/mapbox/mapboxsdk/offline/OfflineRegion$OfflineRegionObserver"; };
-    };
-
-    class OfflineRegionStatusCallback {
-    public:
-        static constexpr auto Name() { return "com/mapbox/mapboxsdk/offline/OfflineRegion$OfflineRegionStatusCallback"; };
-
-        static void onError(jni::JNIEnv&, const jni::Object<OfflineRegionStatusCallback>&, std::exception_ptr);
-
-        static void onStatus(jni::JNIEnv&,
-                            const jni::Object<OfflineRegionStatusCallback>&,
-                            mbgl::optional<mbgl::OfflineRegionStatus>);
-    };
-
-    class OfflineRegionDeleteCallback {
-    public:
-        static constexpr auto Name() { return "com/mapbox/mapboxsdk/offline/OfflineRegion$OfflineRegionDeleteCallback"; };
-
-        static void onError(jni::JNIEnv&, const jni::Object<OfflineRegionDeleteCallback>&, std::exception_ptr);
-
-        static void onDelete(jni::JNIEnv&, const jni::Object<OfflineRegionDeleteCallback>&);
-    };
-
-    class OfflineRegionInvalidateCallback {
-    public:
-        static constexpr auto Name() { return "com/mapbox/mapboxsdk/offline/OfflineRegion$OfflineRegionInvalidateCallback"; };
-
-        static void onError(jni::JNIEnv&, const jni::Object<OfflineRegionInvalidateCallback>&, std::exception_ptr);
-
-        static void onInvalidate(jni::JNIEnv&, const jni::Object<OfflineRegionInvalidateCallback>&);
-    };
-
-    class OfflineRegionUpdateMetadataCallback {
-    public:
-        static constexpr auto Name() { return "com/mapbox/mapboxsdk/offline/OfflineRegion$OfflineRegionUpdateMetadataCallback"; };
-
-        static void onError(jni::JNIEnv&, const jni::Object<OfflineRegionUpdateMetadataCallback>&, std::exception_ptr);
-
-        static void onUpdate(jni::JNIEnv&,
-                            const jni::Object<OfflineRegionUpdateMetadataCallback>&,
-                            mbgl::optional<mbgl::OfflineRegionMetadata>);
-    };
-
-    static constexpr auto Name() { return "com/mapbox/mapboxsdk/offline/OfflineRegion"; };
-
-    OfflineRegion(jni::JNIEnv&, jni::jlong, const jni::Object<FileSource>&);
-
-    ~OfflineRegion();
-
-    void setOfflineRegionObserver(jni::JNIEnv&, const jni::Object<OfflineRegion::OfflineRegionObserver>&);
-
-    void setOfflineRegionDownloadState(jni::JNIEnv&, jni::jint);
-
-    void getOfflineRegionStatus(jni::JNIEnv&, const jni::Object<OfflineRegion::OfflineRegionStatusCallback>&);
-
-    void deleteOfflineRegion(jni::JNIEnv&, const jni::Object<OfflineRegionDeleteCallback>&);
-
-    void invalidateOfflineRegion(jni::JNIEnv&, const jni::Object<OfflineRegionInvalidateCallback>&);
-
-    void updateOfflineRegionMetadata(jni::JNIEnv&, const jni::Array<jni::jbyte>&, const jni::Object<OfflineRegionUpdateMetadataCallback>&);
-
-    static jni::Local<jni::Object<OfflineRegion>> New(jni::JNIEnv&, const jni::Object<FileSource>&, mbgl::OfflineRegion);
-
-    static jni::Local<jni::Array<jni::jbyte>> metadata(jni::JNIEnv&, mbgl::OfflineRegionMetadata);
-
-    static mbgl::OfflineRegionMetadata metadata(jni::JNIEnv&, const jni::Array<jni::jbyte>&);
-
-    static void registerNative(jni::JNIEnv&);
-
-private:
-    std::unique_ptr<mbgl::OfflineRegion> region;
-    std::shared_ptr<mbgl::DatabaseFileSource> fileSource;
-};
-
-} // namespace android
-} // namespace mbgl
diff --git a/platform/android/src/offline/offline_region_definition.cpp b/platform/android/src/offline/offline_region_definition.cpp
deleted file mode 100644
index bb9dfc8dd0..0000000000
--- a/platform/android/src/offline/offline_region_definition.cpp
+++ /dev/null
@@ -1,107 +0,0 @@
-#include "offline_region_definition.hpp"
-
-#include "../geometry/lat_lng_bounds.hpp"
-#include "../geojson/geometry.hpp"
-
-#include <exception>
-
-namespace mbgl {
-namespace android {
-
-// OfflineRegionDefinition //
-
-void OfflineRegionDefinition::registerNative(jni::JNIEnv& env) {
-    jni::Class<OfflineRegionDefinition>::Singleton(env);
-}
-
-mbgl::OfflineRegionDefinition OfflineRegionDefinition::getDefinition(JNIEnv& env,
-                                                                     const jni::Object<OfflineRegionDefinition>& jDefinition) {
-    if (jDefinition.IsInstanceOf(env, jni::Class<OfflineTilePyramidRegionDefinition>::Singleton(env))) {
-        return OfflineTilePyramidRegionDefinition::getDefinition(env, jni::Cast(env, jni::Class<OfflineTilePyramidRegionDefinition>::Singleton(env), jDefinition));
-    } else if (jDefinition.IsInstanceOf(env, jni::Class<OfflineGeometryRegionDefinition>::Singleton(env))) {
-        return OfflineGeometryRegionDefinition::getDefinition(env, jni::Cast(env, jni::Class<OfflineGeometryRegionDefinition>::Singleton(env), jDefinition));
-    }
-
-    throw std::runtime_error("Unknown offline region definition java class");
-}
-
-// OfflineTilePyramidRegionDefinition //
-
-jni::Local<jni::Object<OfflineRegionDefinition>> OfflineTilePyramidRegionDefinition::New(jni::JNIEnv& env, const mbgl::OfflineTilePyramidRegionDefinition& definition) {
-    static auto& javaClass = jni::Class<OfflineTilePyramidRegionDefinition>::Singleton(env);
-    static auto constructor = javaClass.GetConstructor<jni::String, jni::Object<LatLngBounds>, jni::jdouble, jni::jdouble, jni::jfloat, jni::jboolean>(env);
-
-    return javaClass.New(env, constructor,
-        jni::Make<jni::String>(env, definition.styleURL),
-        LatLngBounds::New(env, definition.bounds),
-        definition.minZoom,
-        definition.maxZoom,
-        definition.pixelRatio,
-        jni::jboolean(definition.includeIdeographs));
-}
-
-mbgl::OfflineTilePyramidRegionDefinition OfflineTilePyramidRegionDefinition::getDefinition(jni::JNIEnv& env, const jni::Object<OfflineTilePyramidRegionDefinition>& jDefinition) {
-    // Field references
-    static auto& javaClass = jni::Class<OfflineTilePyramidRegionDefinition>::Singleton(env);
-    static auto styleURLF = javaClass.GetField<jni::String>(env, "styleURL");
-    static auto boundsF = javaClass.GetField<jni::Object<LatLngBounds>>(env, "bounds");
-    static auto minZoomF = javaClass.GetField<jni::jdouble>(env, "minZoom");
-    static auto maxZoomF = javaClass.GetField<jni::jdouble>(env, "maxZoom");
-    static auto pixelRatioF = javaClass.GetField<jni::jfloat>(env, "pixelRatio");
-    static auto includeIdeographsF = javaClass.GetField<jni::jboolean >(env, "includeIdeographs");
-
-    return mbgl::OfflineTilePyramidRegionDefinition(
-        jni::Make<std::string>(env, jDefinition.Get(env, styleURLF)),
-        LatLngBounds::getLatLngBounds(env, jDefinition.Get(env, boundsF)),
-        jDefinition.Get(env, minZoomF),
-        jDefinition.Get(env, maxZoomF),
-        jDefinition.Get(env, pixelRatioF),
-        jDefinition.Get(env, includeIdeographsF)
-    );
-}
-
-void OfflineTilePyramidRegionDefinition::registerNative(jni::JNIEnv& env) {
-    jni::Class<OfflineTilePyramidRegionDefinition>::Singleton(env);
-}
-
-// OfflineGeometryRegionDefinition //
-
-jni::Local<jni::Object<OfflineRegionDefinition>> OfflineGeometryRegionDefinition::New(jni::JNIEnv& env, const mbgl::OfflineGeometryRegionDefinition& definition) {
-    static auto& javaClass = jni::Class<OfflineGeometryRegionDefinition>::Singleton(env);
-    static auto constructor = javaClass.GetConstructor<jni::String, jni::Object<geojson::Geometry>, jni::jdouble, jni::jdouble, jni::jfloat, jni::jboolean>(env);
-
-    return javaClass.New(env, constructor,
-        jni::Make<jni::String>(env, definition.styleURL),
-        geojson::Geometry::New(env, definition.geometry),
-        definition.minZoom,
-        definition.maxZoom,
-        definition.pixelRatio,
-        jni::jboolean(definition.includeIdeographs));
-}
-
-mbgl::OfflineGeometryRegionDefinition OfflineGeometryRegionDefinition::getDefinition(jni::JNIEnv& env, const jni::Object<OfflineGeometryRegionDefinition>& jDefinition) {
-    // Field references
-    static auto& javaClass = jni::Class<OfflineGeometryRegionDefinition>::Singleton(env);
-    static auto styleURLF = javaClass.GetField<jni::String>(env, "styleURL");
-    static auto geometryF = javaClass.GetField<jni::Object<geojson::Geometry>>(env, "geometry");
-    static auto minZoomF = javaClass.GetField<jni::jdouble>(env, "minZoom");
-    static auto maxZoomF = javaClass.GetField<jni::jdouble>(env, "maxZoom");
-    static auto pixelRatioF = javaClass.GetField<jni::jfloat>(env, "pixelRatio");
-    static auto includeIdeographsF = javaClass.GetField<jni::jboolean>(env, "includeIdeographs");
-
-    return mbgl::OfflineGeometryRegionDefinition(
-        jni::Make<std::string>(env, jDefinition.Get(env, styleURLF)),
-        geojson::Geometry::convert(env, jDefinition.Get(env, geometryF)),
-        jDefinition.Get(env, minZoomF),
-        jDefinition.Get(env, maxZoomF),
-        jDefinition.Get(env, pixelRatioF),
-        jDefinition.Get(env, includeIdeographsF)
-    );
-}
-
-void OfflineGeometryRegionDefinition::registerNative(jni::JNIEnv& env) {
-    jni::Class<OfflineGeometryRegionDefinition>::Singleton(env);
-}
-
-} // namespace android
-} // namespace mbgl
diff --git a/platform/android/src/offline/offline_region_definition.hpp b/platform/android/src/offline/offline_region_definition.hpp
deleted file mode 100644
index 827fac0a80..0000000000
--- a/platform/android/src/offline/offline_region_definition.hpp
+++ /dev/null
@@ -1,43 +0,0 @@
-#pragma once
-
-#include <mbgl/storage/offline.hpp>
-#include <jni/jni.hpp>
-
-namespace mbgl {
-namespace android {
-
-class OfflineRegionDefinition {
-public:
-    static constexpr auto Name() { return "com/mapbox/mapboxsdk/offline/OfflineRegionDefinition"; };
-
-    static void registerNative(jni::JNIEnv&);
-
-    static mbgl::OfflineRegionDefinition getDefinition(JNIEnv& env, const jni::Object<OfflineRegionDefinition>& jDefinition);
-};
-
-class OfflineTilePyramidRegionDefinition {
-public:
-    using SuperTag = OfflineRegionDefinition;
-    static constexpr auto Name() { return "com/mapbox/mapboxsdk/offline/OfflineTilePyramidRegionDefinition"; };
-
-    static jni::Local<jni::Object<OfflineRegionDefinition>> New(jni::JNIEnv&, const mbgl::OfflineTilePyramidRegionDefinition&);
-
-    static mbgl::OfflineTilePyramidRegionDefinition getDefinition(jni::JNIEnv&, const jni::Object<OfflineTilePyramidRegionDefinition>&);
-
-    static void registerNative(jni::JNIEnv&);
-};
-
-class OfflineGeometryRegionDefinition {
-public:
-    using SuperTag = OfflineRegionDefinition;
-    static constexpr auto Name() { return "com/mapbox/mapboxsdk/offline/OfflineGeometryRegionDefinition"; };
-
-    static jni::Local<jni::Object<OfflineRegionDefinition>> New(jni::JNIEnv&, const mbgl::OfflineGeometryRegionDefinition&);
-
-    static mbgl::OfflineGeometryRegionDefinition getDefinition(jni::JNIEnv&, const jni::Object<OfflineGeometryRegionDefinition>&);
-
-    static void registerNative(jni::JNIEnv&);
-};
-
-} // namespace android
-} // namespace mbgl
diff --git a/platform/android/src/offline/offline_region_error.cpp b/platform/android/src/offline/offline_region_error.cpp
deleted file mode 100644
index 199bbafa6b..0000000000
--- a/platform/android/src/offline/offline_region_error.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-#include "offline_region_error.hpp"
-
-namespace mbgl {
-namespace android {
-
-jni::Local<jni::Object<OfflineRegionError>> OfflineRegionError::New(jni::JNIEnv& env, mbgl::Response::Error error) {
-
-    // Handle the value of reason independently of the underlying int value
-    std::string reason;
-    switch(error.reason) {
-        case mbgl::Response::Error::Reason::Success:
-            reason = "REASON_SUCCESS";
-            break;
-        case mbgl::Response::Error::Reason::NotFound:
-            reason = "REASON_NOT_FOUND";
-            break;
-        case mbgl::Response::Error::Reason::Server:
-            reason = "REASON_SERVER";
-            break;
-        case mbgl::Response::Error::Reason::Connection:
-            reason = "REASON_CONNECTION";
-            break;
-        case mbgl::Response::Error::Reason::RateLimit:
-            reason = "REASON_RATE_LIMIT";
-            break;
-        case mbgl::Response::Error::Reason::Other:
-            reason = "REASON_OTHER";
-            break;
-    }
-
-    static auto& javaClass = jni::Class<OfflineRegionError>::Singleton(env);
-    static auto constructor = javaClass.GetConstructor<jni::String, jni::String>(env);
-
-    return javaClass.New(env, constructor,
-        jni::Make<jni::String>(env, reason),
-        jni::Make<jni::String>(env, error.message));
-}
-
-void OfflineRegionError::registerNative(jni::JNIEnv& env) {
-    jni::Class<OfflineRegionError>::Singleton(env);
-}
-
-} // namespace android
-} // namespace mbgl
diff --git a/platform/android/src/offline/offline_region_error.hpp b/platform/android/src/offline/offline_region_error.hpp
deleted file mode 100644
index 151e05ab19..0000000000
--- a/platform/android/src/offline/offline_region_error.hpp
+++ /dev/null
@@ -1,19 +0,0 @@
-#pragma once
-
-#include <mbgl/storage/offline.hpp>
-#include <jni/jni.hpp>
-
-namespace mbgl {
-namespace android {
-
-class OfflineRegionError {
-public:
-    static constexpr auto Name() { return "com/mapbox/mapboxsdk/offline/OfflineRegionError"; };
-
-    static jni::Local<jni::Object<OfflineRegionError>> New(jni::JNIEnv&, mbgl::Response::Error);
-
-    static void registerNative(jni::JNIEnv&);
-};
-
-} // namespace android
-} // namespace mbgl
diff --git a/platform/android/src/offline/offline_region_status.cpp b/platform/android/src/offline/offline_region_status.cpp
deleted file mode 100644
index 5dd9f20a7f..0000000000
--- a/platform/android/src/offline/offline_region_status.cpp
+++ /dev/null
@@ -1,38 +0,0 @@
-#include "offline_region_status.hpp"
-
-namespace mbgl {
-namespace android {
-
-jni::Local<jni::Object<OfflineRegionStatus>> OfflineRegionStatus::New(jni::JNIEnv& env, mbgl::OfflineRegionStatus status) {
-
-    // Convert to jint
-    jint downloadState;
-    switch(status.downloadState) {
-        case mbgl::OfflineRegionDownloadState::Inactive:
-            downloadState = 0;
-            break;
-        case mbgl::OfflineRegionDownloadState::Active:
-            downloadState = 1;
-            break;
-    }
-
-    // Create java object
-    static auto& javaClass = jni::Class<OfflineRegionStatus>::Singleton(env);
-    static auto constructor = javaClass.GetConstructor<jint, jlong, jlong, jlong, jlong, jlong, jboolean>(env);
-    return javaClass.New(env, constructor,
-        downloadState,
-        jlong(status.completedResourceCount),
-        jlong(status.completedResourceSize),
-        jlong(status.completedTileCount),
-        jlong(status.completedTileSize),
-        jlong(status.requiredResourceCount),
-        jboolean(status.requiredResourceCountIsPrecise)
-    );
-}
-
-void OfflineRegionStatus::registerNative(jni::JNIEnv& env) {
-    jni::Class<OfflineRegionStatus>::Singleton(env);
-}
-
-} // namespace android
-} // namespace mbgl
diff --git a/platform/android/src/offline/offline_region_status.hpp b/platform/android/src/offline/offline_region_status.hpp
deleted file mode 100644
index 9ef48ec357..0000000000
--- a/platform/android/src/offline/offline_region_status.hpp
+++ /dev/null
@@ -1,19 +0,0 @@
-#pragma once
-
-#include <mbgl/storage/offline.hpp>
-#include <jni/jni.hpp>
-
-namespace mbgl {
-namespace android {
-
-class OfflineRegionStatus {
-public:
-    static constexpr auto Name() { return "com/mapbox/mapboxsdk/offline/OfflineRegionStatus"; };
-
-    static jni::Local<jni::Object<OfflineRegionStatus>> New(jni::JNIEnv&, mbgl::OfflineRegionStatus status);
-
-    static void registerNative(jni::JNIEnv&);
-};
-
-} // namespace android
-} // namespace mbgl
diff --git a/platform/android/src/snapshotter/map_snapshot.cpp b/platform/android/src/snapshotter/map_snapshot.cpp
deleted file mode 100644
index 1650f72dc7..0000000000
--- a/platform/android/src/snapshotter/map_snapshot.cpp
+++ /dev/null
@@ -1,65 +0,0 @@
-#include "map_snapshot.hpp"
-
-#include "../bitmap.hpp"
-#include "../conversion/collection.hpp"
-
-#include <memory>
-
-namespace mbgl {
-namespace android {
-
-MapSnapshot::MapSnapshot(float pixelRatio_, MapSnapshot::PointForFn pointForFn_, MapSnapshot::LatLngForFn latLngForFn_)
-    : pixelRatio(pixelRatio_)
-    , pointForFn(std::move(pointForFn_))
-    , latLngForFn(std::move(latLngForFn_)) {
-}
-
-MapSnapshot::~MapSnapshot() = default;
-
-jni::Local<jni::Object<PointF>> MapSnapshot::pixelForLatLng(jni::JNIEnv& env, jni::Object<LatLng>& jLatLng) {
-    ScreenCoordinate point = pointForFn(LatLng::getLatLng(env, jLatLng));
-    return PointF::New(env, point.x * pixelRatio, point.y * pixelRatio);
-}
-
-jni::Local<jni::Object<LatLng>> MapSnapshot::latLngForPixel(jni::JNIEnv& env, jni::Object<PointF>& jPoint) {
-    return LatLng::New(env, latLngForFn(PointF::getScreenCoordinate(env, jPoint)));
-}
-
-// Static methods //
-
-jni::Local<jni::Object<MapSnapshot>> MapSnapshot::New(JNIEnv& env,
-                                          PremultipliedImage&& image,
-                                          float pixelRatio,
-                                          std::vector<std::string> attributions,
-                                          bool showLogo,
-                                          mbgl::MapSnapshotter::PointForFn pointForFn,
-                                          mbgl::MapSnapshotter::LatLngForFn latLngForFn) {
-    // Create the bitmap
-    auto bitmap = Bitmap::CreateBitmap(env, std::move(image));
-
-    // Create the Mapsnapshot peers
-    static auto& javaClass = jni::Class<MapSnapshot>::Singleton(env);
-    static auto constructor = javaClass.GetConstructor<jni::jlong, jni::Object<Bitmap>, jni::Array<jni::String>, jni::jboolean>(env);
-    auto nativePeer = std::make_unique<MapSnapshot>(pixelRatio, pointForFn, latLngForFn);
-    return javaClass.New(env, constructor, reinterpret_cast<jlong>(nativePeer.release()), bitmap, conversion::toArray(env, attributions), (jni::jboolean) showLogo);
-}
-
-void MapSnapshot::registerNative(jni::JNIEnv& env) {
-    // Lookup the class
-    static auto& javaClass = jni::Class<MapSnapshot>::Singleton(env);
-
-#define METHOD(MethodPtr, name) jni::MakeNativePeerMethod<decltype(MethodPtr), (MethodPtr)>(name)
-
-    // Register the peer
-    jni::RegisterNativePeer<MapSnapshot>(env, javaClass,
-                                            "nativePtr",
-                                            std::make_unique<MapSnapshot, JNIEnv&>,
-                                            "initialize",
-                                            "finalize",
-                                            METHOD(&MapSnapshot::latLngForPixel, "latLngForPixel"),
-                                            METHOD(&MapSnapshot::pixelForLatLng, "pixelForLatLng")
-    );
-}
-
-} // namespace android
-} // namespace mbgl
diff --git a/platform/android/src/snapshotter/map_snapshot.hpp b/platform/android/src/snapshotter/map_snapshot.hpp
deleted file mode 100644
index 6b82d02835..0000000000
--- a/platform/android/src/snapshotter/map_snapshot.hpp
+++ /dev/null
@@ -1,48 +0,0 @@
-#pragma once
-
-#include <mbgl/map/map_snapshotter.hpp>
-
-#include <jni/jni.hpp>
-
-#include "../geometry/lat_lng.hpp"
-#include "../graphics/pointf.hpp"
-
-#include <vector>
-#include <string>
-
-namespace mbgl {
-namespace android {
-
-class MapSnapshot {
-public:
-
-    using PointForFn = mbgl::MapSnapshotter::PointForFn;
-    using LatLngForFn = mbgl::MapSnapshotter::LatLngForFn;
-
-    static constexpr auto Name() { return "com/mapbox/mapboxsdk/snapshotter/MapSnapshot"; };
-
-    static void registerNative(jni::JNIEnv&);
-
-    static jni::Local<jni::Object<MapSnapshot>> New(JNIEnv& env,
-                                        PremultipliedImage&& image,
-                                        float pixelRatio,
-                                        std::vector<std::string> attributions,
-                                        bool showLogo,
-                                        PointForFn pointForFn,
-                                        LatLngForFn latLngForFn);
-
-    MapSnapshot(jni::JNIEnv&) {};
-    MapSnapshot(float pixelRatio, PointForFn, LatLngForFn);
-    ~MapSnapshot();
-
-    jni::Local<jni::Object<PointF>> pixelForLatLng(jni::JNIEnv&, jni::Object<LatLng>&);
-    jni::Local<jni::Object<LatLng>> latLngForPixel(jni::JNIEnv&, jni::Object<PointF>&);
-
-private:
-    float pixelRatio;
-    mbgl::MapSnapshotter::PointForFn pointForFn;
-    mbgl::MapSnapshotter::LatLngForFn latLngForFn;
-};
-
-} // namespace android
-} // namespace mbgl
\ No newline at end of file
diff --git a/platform/android/src/snapshotter/map_snapshotter.cpp b/platform/android/src/snapshotter/map_snapshotter.cpp
deleted file mode 100644
index a02c9e5c93..0000000000
--- a/platform/android/src/snapshotter/map_snapshotter.cpp
+++ /dev/null
@@ -1,353 +0,0 @@
-#include "map_snapshotter.hpp"
-
-#include <mbgl/actor/scheduler.hpp>
-#include <mbgl/renderer/renderer.hpp>
-#include <mbgl/style/style.hpp>
-#include <mbgl/util/logging.hpp>
-#include <mbgl/util/string.hpp>
-
-#include "../attach_env.hpp"
-#include "../style/layers/layer_manager.hpp"
-#include "map_snapshot.hpp"
-
-namespace mbgl {
-namespace android {
-
-MapSnapshotter::MapSnapshotter(jni::JNIEnv& _env,
-                               const jni::Object<MapSnapshotter>& _obj,
-                               const jni::Object<FileSource>& _jFileSource,
-                               jni::jfloat _pixelRatio,
-                               jni::jint width,
-                               jni::jint height,
-                               const jni::String& styleURL,
-                               const jni::String& styleJSON,
-                               const jni::Object<LatLngBounds>& region,
-                               const jni::Object<CameraPosition>& position,
-                               jni::jboolean _showLogo,
-                               const jni::String& _localIdeographFontFamily)
-        : javaPeer(_env, _obj)
-        , pixelRatio(_pixelRatio) {
-
-    // Get a reference to the JavaVM for callbacks
-    if (_env.GetJavaVM(&vm) < 0) {
-        _env.ExceptionDescribe();
-        return;
-    }
-
-    weakScheduler = mbgl::Scheduler::GetCurrent()->makeWeakPtr();
-
-    jFileSource = FileSource::getNativePeer(_env, _jFileSource);
-    auto size = mbgl::Size { static_cast<uint32_t>(width), static_cast<uint32_t>(height) };
-
-    showLogo = _showLogo;
-
-    // Create the core snapshotter
-    snapshotter = std::make_unique<mbgl::MapSnapshotter>(
-        size,
-        pixelRatio,
-        mbgl::android::FileSource::getSharedResourceOptions(_env, _jFileSource),
-        *this,
-        _localIdeographFontFamily ? jni::Make<std::string>(_env, _localIdeographFontFamily) : optional<std::string>{});
-
-    if (position) {
-        snapshotter->setCameraOptions(CameraPosition::getCameraOptions(_env, position, pixelRatio));
-    }
-
-    if (region) {
-        snapshotter->setRegion(LatLngBounds::getLatLngBounds(_env, region));
-    }
-
-    if (styleJSON) {
-        snapshotter->setStyleJSON(jni::Make<std::string>(_env, styleJSON));
-    } else {
-        snapshotter->setStyleURL(jni::Make<std::string>(_env, styleURL));
-    }
-}
-
-MapSnapshotter::~MapSnapshotter() {
-    auto guard = weakScheduler.lock();
-    if (weakScheduler && weakScheduler.get() != mbgl::Scheduler::GetCurrent()) {
-        snapshotter->cancel();
-        weakScheduler->schedule([ptr = snapshotter.release()]() mutable {
-            if (ptr) {
-                delete ptr;
-            }
-        });
-    }
-}
-
-void MapSnapshotter::start(JNIEnv& env) {
-    MBGL_VERIFY_THREAD(tid);
-    activateFilesource(env);
-    snapshotter->snapshot([this](std::exception_ptr err,
-                                 PremultipliedImage image,
-                                 std::vector<std::string> attributions,
-                                 mbgl::MapSnapshotter::PointForFn pointForFn,
-                                 mbgl::MapSnapshotter::LatLngForFn latLngForFn) {
-        MBGL_VERIFY_THREAD(tid);
-        android::UniqueEnv _env = android::AttachEnv();
-        static auto& javaClass = jni::Class<MapSnapshotter>::Singleton(*_env);
-
-        if (err) {
-            // error handler callback
-            static auto onSnapshotFailed = javaClass.GetMethod<void (jni::String)>(*_env, "onSnapshotFailed");
-            auto weakReference = javaPeer.get(*_env);
-            if (weakReference) {
-                weakReference.Call(*_env, onSnapshotFailed, jni::Make<jni::String>(*_env, util::toString(err)));
-            }
-        } else {
-            // Create the wrapper
-            auto mapSnapshot = android::MapSnapshot::New(*_env, std::move(image), pixelRatio, attributions, showLogo, pointForFn, latLngForFn);
-
-            // invoke callback
-            static auto onSnapshotReady = javaClass.GetMethod<void (jni::Object<MapSnapshot>)>(*_env, "onSnapshotReady");
-            auto weakReference = javaPeer.get(*_env);
-            if (weakReference) {
-                weakReference.Call(*_env, onSnapshotReady, mapSnapshot);
-            }
-        }
-
-        deactivateFilesource(*_env);
-    });
-}
-
-void MapSnapshotter::cancel(JNIEnv& env) {
-    MBGL_VERIFY_THREAD(tid);
-    snapshotter->cancel();
-    deactivateFilesource(env);
-}
-
-void MapSnapshotter::setStyleUrl(JNIEnv& env, const jni::String& styleURL) {
-    snapshotter->setStyleURL(jni::Make<std::string>(env, styleURL));
-}
-
-void MapSnapshotter::setStyleJson(JNIEnv& env, const jni::String& styleJSON) {
-    snapshotter->setStyleJSON(jni::Make<std::string>(env, styleJSON));
-}
-
-void MapSnapshotter::setSize(JNIEnv&, jni::jint width, jni::jint height) {
-    auto size = mbgl::Size { static_cast<uint32_t>(width), static_cast<uint32_t>(height) };
-    snapshotter->setSize(size);
-}
-
-void MapSnapshotter::setCameraPosition(JNIEnv& env, const jni::Object<CameraPosition>& position) {
-    auto options = CameraPosition::getCameraOptions(env, position, pixelRatio);
-    snapshotter->setCameraOptions(options);
-}
-
-void MapSnapshotter::setRegion(JNIEnv& env, const jni::Object<LatLngBounds>& region) {
-    snapshotter->setRegion(LatLngBounds::getLatLngBounds(env, region));
-}
-
-// Private methods //
-
-void MapSnapshotter::activateFilesource(JNIEnv& env) {
-    if (!activatedFilesource) {
-        activatedFilesource = true;
-        jFileSource->resume(env);
-    }
-}
-
-void MapSnapshotter::deactivateFilesource(JNIEnv& env) {
-    if (activatedFilesource) {
-        activatedFilesource = false;
-        jFileSource->pause(env);
-    }
-}
-
-void MapSnapshotter::onDidFailLoadingStyle(const std::string& error) {
-    MBGL_VERIFY_THREAD(tid);
-    android::UniqueEnv _env = android::AttachEnv();
-    static auto& javaClass = jni::Class<MapSnapshotter>::Singleton(*_env);
-    static auto onDidFailLoadingStyle = javaClass.GetMethod<void(jni::String)>(*_env, "onDidFailLoadingStyle");
-    auto weakReference = javaPeer.get(*_env);
-    if (weakReference) {
-        weakReference.Call(*_env, onDidFailLoadingStyle, jni::Make<jni::String>(*_env, error));
-    }
-}
-
-void MapSnapshotter::onDidFinishLoadingStyle() {
-    MBGL_VERIFY_THREAD(tid);
-    android::UniqueEnv _env = android::AttachEnv();
-
-    static auto& javaClass = jni::Class<MapSnapshotter>::Singleton(*_env);
-    static auto onDidFinishLoadingStyle = javaClass.GetMethod<void()>(*_env, "onDidFinishLoadingStyle");
-    auto weakReference = javaPeer.get(*_env);
-    if (weakReference) {
-        weakReference.Call(*_env, onDidFinishLoadingStyle);
-    }
-}
-
-void MapSnapshotter::onStyleImageMissing(const std::string& imageName) {
-    MBGL_VERIFY_THREAD(tid);
-    android::UniqueEnv _env = android::AttachEnv();
-    static auto& javaClass = jni::Class<MapSnapshotter>::Singleton(*_env);
-    static auto onStyleImageMissing = javaClass.GetMethod<void(jni::String)>(*_env, "onStyleImageMissing");
-    auto weakReference = javaPeer.get(*_env);
-    if (weakReference) {
-        weakReference.Call(*_env, onStyleImageMissing, jni::Make<jni::String>(*_env, imageName));
-    }
-}
-
-void MapSnapshotter::addLayerAt(JNIEnv& env, jlong nativeLayerPtr, jni::jint index) {
-    assert(nativeLayerPtr != 0);
-    const auto layers = snapshotter->getStyle().getLayers();
-    auto* layer = reinterpret_cast<Layer*>(nativeLayerPtr);
-    // Check index
-    const int numLayers = layers.size() - 1;
-    if (index > numLayers || index < 0) {
-        Log::Error(Event::JNI, "Index out of range: %i", index);
-        jni::ThrowNew(env,
-                      jni::FindClass(env, "com/mapbox/mapboxsdk/style/layers/CannotAddLayerException"),
-                      std::string("Invalid index").c_str());
-    }
-    // Insert it below the current at that index
-    try {
-        layer->addToStyle(snapshotter->getStyle(), layers.at(index)->getID());
-    } catch (const std::runtime_error& error) {
-        jni::ThrowNew(
-            env, jni::FindClass(env, "com/mapbox/mapboxsdk/style/layers/CannotAddLayerException"), error.what());
-    }
-}
-
-void MapSnapshotter::addLayerBelow(JNIEnv& env, jlong nativeLayerPtr, const jni::String& below) {
-    assert(nativeLayerPtr != 0);
-
-    auto* layer = reinterpret_cast<Layer*>(nativeLayerPtr);
-    try {
-        layer->addToStyle(
-            snapshotter->getStyle(),
-            below ? mbgl::optional<std::string>(jni::Make<std::string>(env, below)) : mbgl::optional<std::string>());
-    } catch (const std::runtime_error& error) {
-        jni::ThrowNew(
-            env, jni::FindClass(env, "com/mapbox/mapboxsdk/style/layers/CannotAddLayerException"), error.what());
-    }
-}
-
-void MapSnapshotter::addLayerAbove(JNIEnv& env, jlong nativeLayerPtr, const jni::String& above) {
-    assert(nativeLayerPtr != 0);
-    auto* newLayer = reinterpret_cast<Layer*>(nativeLayerPtr);
-
-    // Find the sibling
-    const auto snapshotterLayers = snapshotter->getStyle().getLayers();
-    auto siblingId = jni::Make<std::string>(env, above);
-
-    size_t index = 0;
-    for (auto* snapshotterLayer : snapshotterLayers) {
-        ++index;
-        if (snapshotterLayer->getID() == siblingId) {
-            break;
-        }
-    }
-
-    // Check if we found a sibling to place before
-    mbgl::optional<std::string> before;
-    if (index > snapshotterLayers.size()) {
-        // Not found
-        jni::ThrowNew(env,
-                      jni::FindClass(env, "com/mapbox/mapboxsdk/style/layers/CannotAddLayerException"),
-                      std::string("Could not find layer: ").append(siblingId).c_str());
-    } else if (index < snapshotterLayers.size()) {
-        // Place before the sibling
-        before = {snapshotterLayers.at(index)->getID()};
-    }
-
-    // Add the layer
-    try {
-        newLayer->addToStyle(snapshotter->getStyle(), before);
-    } catch (const std::runtime_error& error) {
-        jni::ThrowNew(
-            env, jni::FindClass(env, "com/mapbox/mapboxsdk/style/layers/CannotAddLayerException"), error.what());
-    }
-}
-
-void MapSnapshotter::addSource(JNIEnv& env, const jni::Object<Source>& obj, jlong sourcePtr) {
-    assert(sourcePtr != 0);
-
-    auto* source = reinterpret_cast<Source*>(sourcePtr);
-    try {
-        source->addToStyle(env, obj, snapshotter->getStyle());
-    } catch (const std::runtime_error& error) {
-        jni::ThrowNew(
-            env, jni::FindClass(env, "com/mapbox/mapboxsdk/style/sources/CannotAddSourceException"), error.what());
-    }
-}
-
-void MapSnapshotter::addImages(JNIEnv& env, const jni::Array<jni::Object<mbgl::android::Image>>& jimages) {
-    jni::NullCheck(env, &jimages);
-    std::size_t len = jimages.Length(env);
-
-    for (std::size_t i = 0; i < len; ++i) {
-        auto image = mbgl::android::Image::getImage(env, jimages.Get(env, i));
-        snapshotter->getStyle().addImage(std::make_unique<mbgl::style::Image>(image));
-    }
-}
-
-jni::Local<jni::Object<Layer>> MapSnapshotter::getLayer(JNIEnv& env, const jni::String& layerId) {
-    // Find the layer
-    mbgl::style::Layer* coreLayer = snapshotter->getStyle().getLayer(jni::Make<std::string>(env, layerId));
-    if (!coreLayer) {
-        mbgl::Log::Debug(mbgl::Event::JNI, "No layer found");
-        return jni::Local<jni::Object<Layer>>();
-    }
-
-    // Create and return the layer's native peer
-    return LayerManagerAndroid::get()->createJavaLayerPeer(env, *coreLayer);
-}
-
-jni::Local<jni::Object<Source>> MapSnapshotter::getSource(JNIEnv& env, const jni::String& sourceId) {
-    // Find the source
-    mbgl::style::Source* coreSource = snapshotter->getStyle().getSource(jni::Make<std::string>(env, sourceId));
-    if (!coreSource) {
-        mbgl::Log::Debug(mbgl::Event::JNI, "No source found");
-        return jni::Local<jni::Object<Source>>();
-    }
-
-    // Create and return the source's native peer
-    return jni::NewLocal(env, Source::peerForCoreSource(env, *coreSource));
-}
-
-// Static methods //
-
-void MapSnapshotter::registerNative(jni::JNIEnv& env) {
-    // Lookup the class
-    static auto& javaClass = jni::Class<MapSnapshotter>::Singleton(env);
-
-#define METHOD(MethodPtr, name) jni::MakeNativePeerMethod<decltype(MethodPtr), (MethodPtr)>(name)
-
-    // Register the peer
-    jni::RegisterNativePeer<MapSnapshotter>(env,
-                                            javaClass,
-                                            "nativePtr",
-                                            jni::MakePeer<MapSnapshotter,
-                                                          const jni::Object<MapSnapshotter>&,
-                                                          const jni::Object<FileSource>&,
-                                                          jni::jfloat,
-                                                          jni::jint,
-                                                          jni::jint,
-                                                          const jni::String&,
-                                                          const jni::String&,
-                                                          const jni::Object<LatLngBounds>&,
-                                                          const jni::Object<CameraPosition>&,
-                                                          jni::jboolean,
-                                                          const jni::String&>,
-                                            "nativeInitialize",
-                                            "finalize",
-                                            METHOD(&MapSnapshotter::setStyleUrl, "setStyleUrl"),
-                                            METHOD(&MapSnapshotter::addLayerAt, "nativeAddLayerAt"),
-                                            METHOD(&MapSnapshotter::addLayerBelow, "nativeAddLayerBelow"),
-                                            METHOD(&MapSnapshotter::addLayerAbove, "nativeAddLayerAbove"),
-                                            METHOD(&MapSnapshotter::addSource, "nativeAddSource"),
-                                            METHOD(&MapSnapshotter::addImages, "nativeAddImages"),
-                                            METHOD(&MapSnapshotter::getLayer, "nativeGetLayer"),
-                                            METHOD(&MapSnapshotter::getSource, "nativeGetSource"),
-                                            METHOD(&MapSnapshotter::setStyleJson, "setStyleJson"),
-                                            METHOD(&MapSnapshotter::setSize, "setSize"),
-                                            METHOD(&MapSnapshotter::setCameraPosition, "setCameraPosition"),
-                                            METHOD(&MapSnapshotter::setRegion, "setRegion"),
-                                            METHOD(&MapSnapshotter::start, "nativeStart"),
-                                            METHOD(&MapSnapshotter::cancel, "nativeCancel"));
-}
-
-} // namespace android
-} // namespace mbgl
diff --git a/platform/android/src/snapshotter/map_snapshotter.hpp b/platform/android/src/snapshotter/map_snapshotter.hpp
deleted file mode 100644
index 4d0186e7f8..0000000000
--- a/platform/android/src/snapshotter/map_snapshotter.hpp
+++ /dev/null
@@ -1,87 +0,0 @@
-#pragma once
-
-#include <jni/jni.hpp>
-#include <mapbox/std/weak.hpp>
-#include <mbgl/map/map_snapshotter.hpp>
-#include <mbgl/util/util.hpp>
-
-#include <memory>
-
-#include "../file_source.hpp"
-#include "../geometry/lat_lng_bounds.hpp"
-#include "../map/camera_position.hpp"
-#include "../map/image.hpp"
-#include "../style/layers/layer.hpp"
-#include "../style/sources/source.hpp"
-
-namespace mbgl {
-namespace android {
-
-class MapSnapshotter final : public mbgl::MapSnapshotterObserver {
-public:
-
-    static constexpr auto Name() { return "com/mapbox/mapboxsdk/snapshotter/MapSnapshotter"; };
-
-    static void registerNative(jni::JNIEnv&);
-
-    MapSnapshotter(jni::JNIEnv&,
-                   const jni::Object<MapSnapshotter>&,
-                   const jni::Object<FileSource>&,
-                   jni::jfloat pixelRatio,
-                   jni::jint width,
-                   jni::jint height,
-                   const jni::String& styleURL,
-                   const jni::String& styleJSON,
-                   const jni::Object<LatLngBounds>& region,
-                   const jni::Object<CameraPosition>& position,
-                   jni::jboolean showLogo,
-                   const jni::String& localIdeographFontFamily);
-
-    virtual ~MapSnapshotter() override;
-
-    void setStyleUrl(JNIEnv&, const jni::String& styleURL);
-
-    void setStyleJson(JNIEnv&, const jni::String& styleJSON);
-
-    void setSize(JNIEnv&, jni::jint width, jni::jint height);
-
-    void setCameraPosition(JNIEnv&, const jni::Object<CameraPosition>& position);
-
-    void setRegion(JNIEnv&, const jni::Object<LatLngBounds>& region);
-
-    void start(JNIEnv&);
-
-    void cancel(JNIEnv&);
-
-    void addLayerAt(JNIEnv&, jlong, jni::jint);
-    void addLayerBelow(JNIEnv&, jlong, const jni::String&);
-    void addLayerAbove(JNIEnv&, jlong, const jni::String&);
-    void addSource(JNIEnv&, const jni::Object<Source>&, jlong nativePtr);
-    void addImages(JNIEnv&, const jni::Array<jni::Object<mbgl::android::Image>>&);
-    jni::Local<jni::Object<Layer>> getLayer(JNIEnv&, const jni::String&);
-    jni::Local<jni::Object<Source>> getSource(JNIEnv&, const jni::String&);
-
-    // MapSnapshotterObserver overrides
-    void onDidFailLoadingStyle(const std::string&) override;
-    void onDidFinishLoadingStyle() override;
-    void onStyleImageMissing(const std::string&) override;
-
-private:
-    MBGL_STORE_THREAD(tid);
-
-    JavaVM *vm = nullptr;
-    jni::WeakReference<jni::Object<MapSnapshotter>, jni::EnvAttachingDeleter> javaPeer;
-
-    float pixelRatio;
-    bool showLogo;
-
-    FileSource *jFileSource;
-    void activateFilesource(JNIEnv&);
-    void deactivateFilesource(JNIEnv&);
-    bool activatedFilesource = false;
-    mapbox::base::WeakPtr<mbgl::Scheduler> weakScheduler;
-    std::unique_ptr<mbgl::MapSnapshotter> snapshotter;
-};
-
-} // namespace android
-} // namespace mbgl
diff --git a/platform/android/src/style/android_conversion.hpp b/platform/android/src/style/android_conversion.hpp
deleted file mode 100644
index 6f16804597..0000000000
--- a/platform/android/src/style/android_conversion.hpp
+++ /dev/null
@@ -1,148 +0,0 @@
-#pragma once
-
-#include "value.hpp"
-
-#include <mbgl/util/feature.hpp>
-#include <mbgl/util/logging.hpp>
-#include <mbgl/util/optional.hpp>
-#include <mbgl/style/conversion/geojson.hpp>
-#include <mbgl/style/conversion_impl.hpp>
-
-#include <jni/jni.hpp>
-
-namespace mbgl {
-namespace style {
-namespace conversion {
-
-template <>
-class ConversionTraits<mbgl::android::Value> {
-public:
-    static bool isUndefined(const mbgl::android::Value& value) {
-        return value.isNull();
-    }
-
-    static bool isArray(const mbgl::android::Value& value) {
-        return value.isArray();
-    }
-
-    static bool isObject(const mbgl::android::Value& value) {
-        return value.isObject();
-    }
-
-    static std::size_t arrayLength(const mbgl::android::Value& value) {
-        return value.getLength();;
-    }
-
-    static mbgl::android::Value arrayMember(const mbgl::android::Value& value, std::size_t i) {
-        return value.get(i);
-    }
-
-    static optional<mbgl::android::Value> objectMember(const mbgl::android::Value& value, const char* key) {
-        mbgl::android::Value member = value.get(key);
-        if (!member.isNull()) {
-            return member;
-        } else {
-            return {};
-        }
-    }
-
-    template <class Fn>
-    static optional<Error> eachMember(const mbgl::android::Value& value, Fn&& fn) {
-        assert(value.isObject());
-        mbgl::android::Value keys = value.keyArray();
-        std::size_t length = arrayLength(keys);
-        for(std::size_t i = 0; i < length; ++i){
-            const auto k = keys.get(i).toString();
-            auto v = value.get(k.c_str());
-            optional<Error> result = fn(k, std::move(v));
-            if (result) {
-                return result;
-            }
-        }
-        return {};
-    }
-
-    static optional<bool> toBool(const mbgl::android::Value& value) {
-        if (value.isBool()) {
-            return value.toBool();
-        } else {
-            return {};
-        }
-    }
-
-    static optional<float> toNumber(const mbgl::android::Value& value) {
-        if (value.isNumber()) {
-            auto num = value.toFloat();
-            return num;
-        } else {
-            return {};
-        }
-    }
-
-    static optional<double> toDouble(const mbgl::android::Value& value) {
-        if (value.isNumber()) {
-            return value.toDouble();
-        } else {
-            return {};
-        }
-    }
-
-    static optional<std::string> toString(const mbgl::android::Value& value) {
-        if (value.isString()) {
-            return value.toString();
-        } else {
-            return {};
-        }
-    }
-
-    static optional<Value> toValue(const mbgl::android::Value& value) {
-        if (value.isNull()) {
-            return {};
-        } else if (value.isBool()) {
-            return { value.toBool() };
-        } else if (value.isString()) {
-            return { value.toString() };
-        } else if (value.isNumber()) {
-            return { value.toDouble() };
-        } else {
-            return {};
-        }
-    }
-
-    static optional<GeoJSON> toGeoJSON(const mbgl::android::Value &value, Error &error) {
-        if (value.isNull()) {
-            error = { "no json data found" };
-            return {};
-        }
-
-        if (value.isString()) {
-            return parseGeoJSON(value.toString(), error);
-        }
-
-        if (value.isObject()) {
-            mbgl::android::Value keys = value.keyArray();
-            std::size_t length = arrayLength(keys);
-            for (std::size_t i = 0; i < length; ++i) {
-                if (keys.get(i).toString() == "json") {
-                    auto v = value.get("json");
-                    if (v.isString()) {
-                        return parseGeoJSON(v.toString(), error);
-                    } else {
-                        break;
-                    }
-                }
-            }
-        }
-        error = {"no json data found"};
-        return {};
-    }
-};
-
-template <class T, class...Args>
-optional<T> convert(mbgl::android::Value&& value, Error& error, Args&&...args) {
-    return convert<T>(Convertible(std::move(value)), error, std::forward<Args>(args)...);
-}
-
-} // namespace conversion
-} // namespace style
-} // namespace mbgl
diff --git a/platform/android/src/style/conversion/filter.cpp b/platform/android/src/style/conversion/filter.cpp
deleted file mode 100644
index d15e2747ac..0000000000
--- a/platform/android/src/style/conversion/filter.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-#include "filter.hpp"
-#include "../android_conversion.hpp"
-
-#include <mbgl/style/conversion.hpp>
-#include <mbgl/style/conversion/filter.hpp>
-
-namespace mbgl {
-namespace android {
-namespace conversion {
-
-optional<mbgl::style::Filter> toFilter(jni::JNIEnv& env, const jni::Array<jni::Object<>>& jfilter) {
-    mbgl::optional<mbgl::style::Filter> filter;
-    if (jfilter) {
-      mbgl::style::conversion::Error error;
-      auto converted = mbgl::style::conversion::convert<mbgl::style::Filter>(Value(env, jfilter), error);
-      if (!converted) {
-          mbgl::Log::Error(mbgl::Event::JNI, "Error converting filter: " + error.message);
-      }
-      filter = std::move(*converted);
-    }
-    return filter;
-}
-
-} // namespace conversion
-} // namespace android
-} // namespace mbgl
diff --git a/platform/android/src/style/conversion/filter.hpp b/platform/android/src/style/conversion/filter.hpp
deleted file mode 100644
index 920d336a1a..0000000000
--- a/platform/android/src/style/conversion/filter.hpp
+++ /dev/null
@@ -1,16 +0,0 @@
-#pragma once
-
-#include <mbgl/style/filter.hpp>
-#include <mbgl/util/optional.hpp>
-
-#include <jni/jni.hpp>
-
-namespace mbgl {
-namespace android {
-namespace conversion {
-
-optional<mbgl::style::Filter> toFilter(jni::JNIEnv&, const jni::Array<jni::Object<>>&);
-
-} // namespace conversion
-} // namespace android
-} // namespace mbgl
\ No newline at end of file
diff --git a/platform/android/src/style/conversion/position.cpp b/platform/android/src/style/conversion/position.cpp
deleted file mode 100644
index e3c334afd2..0000000000
--- a/platform/android/src/style/conversion/position.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-#include "position.hpp"
-
-namespace mbgl {
-namespace android {
-namespace conversion {
-
-Result<jni::Local<jni::Object<Position>>> Converter<jni::Local<jni::Object<Position>>, mbgl::style::Position>::operator()(jni::JNIEnv &env, const mbgl::style::Position &value) const {
-    std::array<float, 3> cartPosition = value.getSpherical();
-    return Position::fromPosition(env, cartPosition[0], cartPosition[1], cartPosition[2]);
-}
-
-Result<mbgl::style::Position> Converter<mbgl::style::Position, jni::Object<Position>>::operator()(jni::JNIEnv &env, const jni::Object<Position> &value) const {
-    float radialCoordinate = Position::getRadialCoordinate(env, value);
-    float azimuthalAngle = Position::getAzimuthalAngle(env, value);
-    float polarAngle = Position::getPolarAngle(env, value);
-    std::array<float, 3> cartPosition {{radialCoordinate, azimuthalAngle, polarAngle}};
-    mbgl::style::Position position{};
-    position.set(cartPosition);
-    return position;
-}
-
-}
-}
-}
diff --git a/platform/android/src/style/conversion/position.hpp b/platform/android/src/style/conversion/position.hpp
deleted file mode 100644
index 90409d527d..0000000000
--- a/platform/android/src/style/conversion/position.hpp
+++ /dev/null
@@ -1,25 +0,0 @@
-#pragma once
-
-#include "../../conversion/conversion.hpp"
-#include "../position.hpp"
-
-#include <mbgl/style/position.hpp>
-#include <jni/jni.hpp>
-
-namespace mbgl {
-namespace android {
-namespace conversion {
-
-template <>
-struct Converter<jni::Local<jni::Object<Position>>, mbgl::style::Position> {
-    Result<jni::Local<jni::Object<Position>>> operator()(jni::JNIEnv &env, const mbgl::style::Position &value) const;
-};
-
-template <>
-struct Converter<mbgl::style::Position, jni::Object<Position>> {
-    Result<mbgl::style::Position> operator()(jni::JNIEnv &env, const jni::Object<Position> &value) const;
-};
-
-}
-}
-}
diff --git a/platform/android/src/style/conversion/property_expression.hpp b/platform/android/src/style/conversion/property_expression.hpp
deleted file mode 100644
index 4e26b11f96..0000000000
--- a/platform/android/src/style/conversion/property_expression.hpp
+++ /dev/null
@@ -1,23 +0,0 @@
-#pragma once
-
-#include "../../conversion/conversion.hpp"
-#include "../../gson/json_element.hpp"
-
-#include <mbgl/style/property_expression.hpp>
-
-#include <jni/jni.hpp>
-
-namespace mbgl {
-namespace android {
-namespace conversion {
-
-template <class T>
-struct Converter<jni::Local<jni::Object<android::gson::JsonElement>>, mbgl::style::PropertyExpression<T>> {
-    Result<jni::Local<jni::Object<android::gson::JsonElement>>> operator()(jni::JNIEnv& env, const mbgl::style::PropertyExpression<T>& value) const {
-        return gson::JsonElement::New(env, value.getExpression().serialize());
-    }
-};
-
-} // namespace conversion
-} // namespace android
-} // namespace mbgl
diff --git a/platform/android/src/style/conversion/property_value.hpp b/platform/android/src/style/conversion/property_value.hpp
deleted file mode 100644
index 317705a286..0000000000
--- a/platform/android/src/style/conversion/property_value.hpp
+++ /dev/null
@@ -1,62 +0,0 @@
-#pragma once
-
-#include <mbgl/style/color_ramp_property_value.hpp>
-#include <mbgl/style/property_value.hpp>
-
-#include "../../conversion/conversion.hpp"
-#include "../../conversion/constant.hpp"
-#include "property_expression.hpp"
-
-namespace mbgl {
-namespace android {
-namespace conversion {
-
-/**
- * Conversion from core property value types to Java property value types
- */
-template <typename T>
-class PropertyValueEvaluator {
-public:
-    PropertyValueEvaluator(jni::JNIEnv& _env) : env(_env) {}
-
-    jni::Local<jni::Object<>> operator()(const mbgl::style::Undefined) const {
-        return jni::Local<jni::Object<>>(env, nullptr);
-    }
-
-    jni::Local<jni::Object<>> operator()(const T& value) const {
-        return std::move(*convert<jni::Local<jni::Object<>>>(env, value));
-    }
-
-    jni::Local<jni::Object<>> operator()(const mbgl::style::PropertyExpression<T>& value) const {
-        return std::move(*convert<jni::Local<jni::Object<android::gson::JsonElement>>>(env, value));
-    }
-
-private:
-    jni::JNIEnv& env;
-};
-
-/**
- * Convert core property values to java
- */
-template <class T>
-struct Converter<jni::Local<jni::Object<>>, mbgl::style::PropertyValue<T>> {
-    Result<jni::Local<jni::Object<>>> operator()(jni::JNIEnv& env, const mbgl::style::PropertyValue<T>& value) const {
-        PropertyValueEvaluator<T> evaluator(env);
-        return value.evaluate(evaluator);
-    }
-};
-
-/**
- * Convert core heat map color property value to java
- */
-template <>
-struct Converter<jni::Local<jni::Object<>>, mbgl::style::ColorRampPropertyValue> {
-    Result<jni::Local<jni::Object<>>> operator()(jni::JNIEnv& env, const mbgl::style::ColorRampPropertyValue& value) const {
-        PropertyValueEvaluator<mbgl::style::ColorRampPropertyValue> evaluator(env);
-        return std::move(*convert<jni::Local<jni::Object<>>>(env, value.evaluate(evaluator)));
-    }
-};
-
-} // namespace conversion
-} // namespace android
-} // namespace mbgl
diff --git a/platform/android/src/style/conversion/transition_options.cpp b/platform/android/src/style/conversion/transition_options.cpp
deleted file mode 100644
index 75d9b4cc0d..0000000000
--- a/platform/android/src/style/conversion/transition_options.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-#include "transition_options.hpp"
-
-namespace mbgl {
-namespace android {
-namespace conversion {
-
-Result<jni::Local<jni::Object<TransitionOptions>>> Converter<jni::Local<jni::Object<TransitionOptions>>, mbgl::style::TransitionOptions>::operator()(jni::JNIEnv& env, const mbgl::style::TransitionOptions& value) const {
-    return TransitionOptions::fromTransitionOptions(env,
-        std::chrono::duration_cast<std::chrono::milliseconds>(value.duration.value_or(mbgl::Duration::zero())).count(),
-        std::chrono::duration_cast<std::chrono::milliseconds>(value.delay.value_or(mbgl::Duration::zero())).count(),
-        (jboolean) value.enablePlacementTransitions
-    );
-}
-
-}
-}
-}
diff --git a/platform/android/src/style/conversion/transition_options.hpp b/platform/android/src/style/conversion/transition_options.hpp
deleted file mode 100644
index 06c042922e..0000000000
--- a/platform/android/src/style/conversion/transition_options.hpp
+++ /dev/null
@@ -1,21 +0,0 @@
-#pragma once
-
-#include "../../conversion/conversion.hpp"
-#include "../transition_options.hpp"
-
-#include <mbgl/style/transition_options.hpp>
-
-#include <jni/jni.hpp>
-
-namespace mbgl {
-namespace android {
-namespace conversion {
-
-template<>
-struct Converter<jni::Local<jni::Object<TransitionOptions>>, mbgl::style::TransitionOptions> {
-    Result<jni::Local<jni::Object<TransitionOptions>>> operator()(jni::JNIEnv&, const mbgl::style::TransitionOptions&) const;
-};
-
-}
-}
-}
diff --git a/platform/android/src/style/conversion/url_or_tileset.cpp b/platform/android/src/style/conversion/url_or_tileset.cpp
deleted file mode 100644
index 2ec5856751..0000000000
--- a/platform/android/src/style/conversion/url_or_tileset.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
-#include "url_or_tileset.hpp"
-#include "../android_conversion.hpp"
-
-#include <mbgl/style/conversion.hpp>
-#include <mbgl/style/conversion/tileset.hpp>
-
-namespace mbgl {
-namespace android {
-
-// This conversion is expected not to fail because it's used only in contexts where
-// the value was originally a String or TileSet object on the Java side. If it fails
-// to convert, it's a bug in our serialization or Java-side static typing.
-variant<std::string, Tileset> convertURLOrTileset(mbgl::android::Value&& value) {
-    using namespace mbgl::style::conversion;
-
-    const Convertible convertible(std::move(value));
-    if (isObject(convertible)) {
-        Error error;
-        optional<Tileset> tileset = convert<Tileset>(convertible, error);
-        if (!tileset) {
-            throw std::logic_error(error.message);
-        }
-        return { *tileset };
-    } else {
-        return { *toString(convertible) };
-    }
-}
-
-}
-}
diff --git a/platform/android/src/style/conversion/url_or_tileset.hpp b/platform/android/src/style/conversion/url_or_tileset.hpp
deleted file mode 100644
index f42a9b9a2a..0000000000
--- a/platform/android/src/style/conversion/url_or_tileset.hpp
+++ /dev/null
@@ -1,16 +0,0 @@
-#pragma once
-
-#include <mbgl/util/variant.hpp>
-#include <mbgl/util/tileset.hpp>
-
-#include <string>
-
-#include "../value.hpp"
-
-namespace mbgl {
-namespace android {
-
-variant<std::string, Tileset> convertURLOrTileset(mbgl::android::Value&& value);
-
-}
-}
diff --git a/platform/android/src/style/formatted.cpp b/platform/android/src/style/formatted.cpp
deleted file mode 100644
index 69c3454e23..0000000000
--- a/platform/android/src/style/formatted.cpp
+++ /dev/null
@@ -1,54 +0,0 @@
-#include "formatted.hpp"
-#include "formatted_section.hpp"
-#include "../conversion/conversion.hpp"
-#include "../conversion/constant.hpp"
-
-namespace mbgl {
-namespace android {
-
-void Formatted::registerNative(jni::JNIEnv& env) {
-    jni::Class<Formatted>::Singleton(env);
-}
-
-jni::Local<jni::Object<Formatted>> Formatted::New(jni::JNIEnv& env, const style::expression::Formatted& value) {
-    static auto& formatted = jni::Class<Formatted>::Singleton(env);
-    static auto formattedConstructor = formatted.GetConstructor<jni::Array<jni::Object<FormattedSection>>>(env);
-    static auto& formattedSectionClass = jni::Class<FormattedSection>::Singleton(env);
-
-    auto sections = jni::Array<jni::Object<FormattedSection>>::New(env, value.sections.size());
-    for (std::size_t i = 0; i < value.sections.size(); i++) {
-        auto section = value.sections.at(i);
-        auto text = jni::Make<jni::String>(env, section.text);
-        static auto formattedSectionConstructor = formattedSectionClass.GetConstructor<jni::String>(env);
-        auto formattedSection = formattedSectionClass.New(env, formattedSectionConstructor, text);
-
-        if (section.fontScale) {
-            double fontScale = section.fontScale.value();
-            static auto method = formattedSectionClass.GetMethod<void (jni::Number)>(env, "setFontScale");
-            formattedSection.Call(env, method, jni::Box(env, fontScale));
-        }
-
-        if (section.fontStack) {
-            auto fontStack = jni::Array<jni::String>::New(env, section.fontStack.value().size());
-            for (std::size_t j = 0; j < section.fontStack.value().size(); j++) {
-                fontStack.Set(env, j, jni::Make<jni::String>(env, section.fontStack.value().at(j)));
-            }
-            static auto method = formattedSectionClass.GetMethod<void (jni::Array<jni::String>)>(env, "setFontStack");
-            formattedSection.Call(env, method, fontStack);
-        }
-
-        if (section.textColor) {
-            using namespace mbgl::android::conversion;
-            auto textColor = std::move(*convert<jni::Local<jni::Object<>>>(env, *section.textColor));
-            static auto method = formattedSectionClass.GetMethod<void (jni::Object<>)>(env, "setTextColor");
-            formattedSection.Call(env, method, textColor);
-        }
-
-        sections.Set(env, i, formattedSection);
-    }
-
-    return formatted.New(env, formattedConstructor, sections);
-}
-
-} // namespace android
-} // namespace mbgl
\ No newline at end of file
diff --git a/platform/android/src/style/formatted.hpp b/platform/android/src/style/formatted.hpp
deleted file mode 100644
index ca91f6562c..0000000000
--- a/platform/android/src/style/formatted.hpp
+++ /dev/null
@@ -1,23 +0,0 @@
-#pragma once
-
-#include <mbgl/util/noncopyable.hpp>
-
-#include <jni/jni.hpp>
-#include <mbgl/style/expression/formatted.hpp>
-
-namespace mbgl {
-    namespace android {
-
-        using SuperTag = jni::ObjectTag;
-        class Formatted : private mbgl::util::noncopyable {
-        public:
-            static constexpr auto Name() { return "com/mapbox/mapboxsdk/style/types/Formatted"; };
-
-            static jni::Local<jni::Object<Formatted>>
-            New(jni::JNIEnv&, const style::expression::Formatted &value);
-
-            static void registerNative(jni::JNIEnv &);
-        };
-
-    } // namespace android
-} // namespace mbgl
\ No newline at end of file
diff --git a/platform/android/src/style/formatted_section.cpp b/platform/android/src/style/formatted_section.cpp
deleted file mode 100644
index ddcf76f816..0000000000
--- a/platform/android/src/style/formatted_section.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
-#include "formatted_section.hpp"
-
-namespace mbgl {
-namespace android {
-
-void FormattedSection::registerNative(jni::JNIEnv& env) {
-    jni::Class<FormattedSection>::Singleton(env);
-}
-
-} // namespace android
-} // namespace mbgl
\ No newline at end of file
diff --git a/platform/android/src/style/formatted_section.hpp b/platform/android/src/style/formatted_section.hpp
deleted file mode 100644
index f759a94e8e..0000000000
--- a/platform/android/src/style/formatted_section.hpp
+++ /dev/null
@@ -1,18 +0,0 @@
-#pragma once
-
-#include <mbgl/util/noncopyable.hpp>
-
-#include <jni/jni.hpp>
-
-namespace mbgl {
-namespace android {
-
-class FormattedSection : private mbgl::util::noncopyable {
-public:
-    static constexpr auto Name() { return "com/mapbox/mapboxsdk/style/types/FormattedSection"; };
-
-    static void registerNative(jni::JNIEnv&);
-};
-
-} // namespace android
-} // namespace mbgl
\ No newline at end of file
diff --git a/platform/android/src/style/layers/background_layer.cpp b/platform/android/src/style/layers/background_layer.cpp
deleted file mode 100644
index 3eae30677f..0000000000
--- a/platform/android/src/style/layers/background_layer.cpp
+++ /dev/null
@@ -1,148 +0,0 @@
-// This file is generated. Edit android/platform/scripts/generate-style-code.js, then run `make android-style-code`.
-
-#include "background_layer.hpp"
-
-#include <string>
-
-#include "../conversion/property_value.hpp"
-#include "../conversion/transition_options.hpp"
-
-#include <mbgl/style/layer_impl.hpp>
-
-namespace mbgl {
-namespace android {
-
-    inline mbgl::style::BackgroundLayer& toBackgroundLayer(mbgl::style::Layer& layer) {
-        return static_cast<mbgl::style::BackgroundLayer&>(layer);
-    }
-
-    /**
-     * Creates an owning peer object (for layers not attached to the map) from the JVM side
-     */
-    BackgroundLayer::BackgroundLayer(jni::JNIEnv& env, jni::String& layerId)
-        : Layer(std::make_unique<mbgl::style::BackgroundLayer>(jni::Make<std::string>(env, layerId))) {
-    }
-
-    /**
-     * Creates a non-owning peer object (for layers currently attached to the map)
-     */
-    BackgroundLayer::BackgroundLayer(mbgl::style::BackgroundLayer& coreLayer) : Layer(coreLayer) {}
-
-    /**
-     * Creates an owning peer object (for layers not attached to the map)
-     */
-    BackgroundLayer::BackgroundLayer(std::unique_ptr<mbgl::style::BackgroundLayer> coreLayer)
-        : Layer(std::move(coreLayer)) {}
-
-    BackgroundLayer::~BackgroundLayer() = default;
-
-    // Property getters
-
-    jni::Local<jni::Object<>> BackgroundLayer::getBackgroundColor(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        return std::move(*convert<jni::Local<jni::Object<>>>(env, toBackgroundLayer(layer).getBackgroundColor()));
-    }
-
-    jni::Local<jni::Object<TransitionOptions>> BackgroundLayer::getBackgroundColorTransition(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        mbgl::style::TransitionOptions options = toBackgroundLayer(layer).getBackgroundColorTransition();
-        return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, options));
-    }
-
-    void BackgroundLayer::setBackgroundColorTransition(jni::JNIEnv&, jlong duration, jlong delay) {
-        mbgl::style::TransitionOptions options;
-        options.duration.emplace(mbgl::Milliseconds(duration));
-        options.delay.emplace(mbgl::Milliseconds(delay));
-        toBackgroundLayer(layer).setBackgroundColorTransition(options);
-    }
-
-    jni::Local<jni::Object<>> BackgroundLayer::getBackgroundPattern(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        return std::move(*convert<jni::Local<jni::Object<>>>(env, toBackgroundLayer(layer).getBackgroundPattern()));
-    }
-
-    jni::Local<jni::Object<TransitionOptions>> BackgroundLayer::getBackgroundPatternTransition(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        mbgl::style::TransitionOptions options = toBackgroundLayer(layer).getBackgroundPatternTransition();
-        return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, options));
-    }
-
-    void BackgroundLayer::setBackgroundPatternTransition(jni::JNIEnv&, jlong duration, jlong delay) {
-        mbgl::style::TransitionOptions options;
-        options.duration.emplace(mbgl::Milliseconds(duration));
-        options.delay.emplace(mbgl::Milliseconds(delay));
-        toBackgroundLayer(layer).setBackgroundPatternTransition(options);
-    }
-
-    jni::Local<jni::Object<>> BackgroundLayer::getBackgroundOpacity(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        return std::move(*convert<jni::Local<jni::Object<>>>(env, toBackgroundLayer(layer).getBackgroundOpacity()));
-    }
-
-    jni::Local<jni::Object<TransitionOptions>> BackgroundLayer::getBackgroundOpacityTransition(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        mbgl::style::TransitionOptions options = toBackgroundLayer(layer).getBackgroundOpacityTransition();
-        return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, options));
-    }
-
-    void BackgroundLayer::setBackgroundOpacityTransition(jni::JNIEnv&, jlong duration, jlong delay) {
-        mbgl::style::TransitionOptions options;
-        options.duration.emplace(mbgl::Milliseconds(duration));
-        options.delay.emplace(mbgl::Milliseconds(delay));
-        toBackgroundLayer(layer).setBackgroundOpacityTransition(options);
-    }
-
-
-    // BackgroundJavaLayerPeerFactory
-
-    BackgroundJavaLayerPeerFactory::~BackgroundJavaLayerPeerFactory() = default;
-
-    namespace {
-        jni::Local<jni::Object<Layer>> createJavaPeer(jni::JNIEnv& env, Layer* layer) {
-            static auto& javaClass = jni::Class<BackgroundLayer>::Singleton(env);
-            static auto constructor = javaClass.GetConstructor<jni::jlong>(env);
-            return javaClass.New(env, constructor, reinterpret_cast<jni::jlong>(layer));
-        }
-    }  // namespace
-
-    jni::Local<jni::Object<Layer>> BackgroundJavaLayerPeerFactory::createJavaLayerPeer(jni::JNIEnv& env,
-                                                                                       mbgl::style::Layer& layer) {
-        assert(layer.baseImpl->getTypeInfo() == getTypeInfo());
-        return createJavaPeer(env, new BackgroundLayer(toBackgroundLayer(layer)));
-    }
-
-    jni::Local<jni::Object<Layer>> BackgroundJavaLayerPeerFactory::createJavaLayerPeer(
-        jni::JNIEnv& env, std::unique_ptr<mbgl::style::Layer> layer) {
-        assert(layer->baseImpl->getTypeInfo() == getTypeInfo());
-        return createJavaPeer(env,
-                              new BackgroundLayer(std::unique_ptr<mbgl::style::BackgroundLayer>(
-                                  static_cast<mbgl::style::BackgroundLayer*>(layer.release()))));
-    }
-
-    void BackgroundJavaLayerPeerFactory::registerNative(jni::JNIEnv& env) {
-        // Lookup the class
-        static auto& javaClass = jni::Class<BackgroundLayer>::Singleton(env);
-
-        #define METHOD(MethodPtr, name) jni::MakeNativePeerMethod<decltype(MethodPtr), (MethodPtr)>(name)
-
-        // Register the peer
-        jni::RegisterNativePeer<BackgroundLayer>(
-            env,
-            javaClass,
-            "nativePtr",
-            jni::MakePeer<BackgroundLayer, jni::String&>,
-            "initialize",
-            "finalize",
-            METHOD(&BackgroundLayer::getBackgroundColorTransition, "nativeGetBackgroundColorTransition"),
-            METHOD(&BackgroundLayer::setBackgroundColorTransition, "nativeSetBackgroundColorTransition"),
-            METHOD(&BackgroundLayer::getBackgroundColor, "nativeGetBackgroundColor"),
-            METHOD(&BackgroundLayer::getBackgroundPatternTransition, "nativeGetBackgroundPatternTransition"),
-            METHOD(&BackgroundLayer::setBackgroundPatternTransition, "nativeSetBackgroundPatternTransition"),
-            METHOD(&BackgroundLayer::getBackgroundPattern, "nativeGetBackgroundPattern"),
-            METHOD(&BackgroundLayer::getBackgroundOpacityTransition, "nativeGetBackgroundOpacityTransition"),
-            METHOD(&BackgroundLayer::setBackgroundOpacityTransition, "nativeSetBackgroundOpacityTransition"),
-            METHOD(&BackgroundLayer::getBackgroundOpacity, "nativeGetBackgroundOpacity"));
-    }
-
-} // namespace android
-} // namespace mbgl
diff --git a/platform/android/src/style/layers/background_layer.hpp b/platform/android/src/style/layers/background_layer.hpp
deleted file mode 100644
index e402dc021c..0000000000
--- a/platform/android/src/style/layers/background_layer.hpp
+++ /dev/null
@@ -1,58 +0,0 @@
-// This file is generated. Edit android/platform/scripts/generate-style-code.js, then run `make android-style-code`.
-
-#pragma once
-
-#include "layer.hpp"
-#include "../transition_options.hpp"
-#include <mbgl/layermanager/background_layer_factory.hpp>
-#include <mbgl/style/layers/background_layer.hpp>
-#include <jni/jni.hpp>
-
-namespace mbgl {
-namespace android {
-
-class BackgroundLayer : public Layer {
-public:
-    using SuperTag = Layer;
-    static constexpr auto Name() { return "com/mapbox/mapboxsdk/style/layers/BackgroundLayer"; };
-
-    BackgroundLayer(jni::JNIEnv&, jni::String&);
-
-    BackgroundLayer(mbgl::style::BackgroundLayer&);
-
-    BackgroundLayer(std::unique_ptr<mbgl::style::BackgroundLayer>);
-
-    ~BackgroundLayer();
-
-    // Properties
-
-    jni::Local<jni::Object<jni::ObjectTag>> getBackgroundColor(jni::JNIEnv&);
-    void setBackgroundColorTransition(jni::JNIEnv&, jlong duration, jlong delay);
-    jni::Local<jni::Object<TransitionOptions>> getBackgroundColorTransition(jni::JNIEnv&);
-
-    jni::Local<jni::Object<jni::ObjectTag>> getBackgroundPattern(jni::JNIEnv&);
-    void setBackgroundPatternTransition(jni::JNIEnv&, jlong duration, jlong delay);
-    jni::Local<jni::Object<TransitionOptions>> getBackgroundPatternTransition(jni::JNIEnv&);
-
-    jni::Local<jni::Object<jni::ObjectTag>> getBackgroundOpacity(jni::JNIEnv&);
-    void setBackgroundOpacityTransition(jni::JNIEnv&, jlong duration, jlong delay);
-    jni::Local<jni::Object<TransitionOptions>> getBackgroundOpacityTransition(jni::JNIEnv&);
-
-}; // class BackgroundLayer
-
-class BackgroundJavaLayerPeerFactory final : public JavaLayerPeerFactory,  public mbgl::BackgroundLayerFactory {
-public:
-    ~BackgroundJavaLayerPeerFactory() override;
-
-    // JavaLayerPeerFactory overrides.
-    jni::Local<jni::Object<Layer>> createJavaLayerPeer(jni::JNIEnv&, mbgl::style::Layer&) final;
-    jni::Local<jni::Object<Layer>> createJavaLayerPeer(jni::JNIEnv& env, std::unique_ptr<mbgl::style::Layer>) final;
-
-    void registerNative(jni::JNIEnv&) final;
-
-    LayerFactory* getLayerFactory() final { return this; }
-
-};  // class BackgroundJavaLayerPeerFactory
-
-} // namespace android
-} // namespace mbgl
diff --git a/platform/android/src/style/layers/circle_layer.cpp b/platform/android/src/style/layers/circle_layer.cpp
deleted file mode 100644
index a7fae5e233..0000000000
--- a/platform/android/src/style/layers/circle_layer.cpp
+++ /dev/null
@@ -1,270 +0,0 @@
-// This file is generated. Edit android/platform/scripts/generate-style-code.js, then run `make android-style-code`.
-
-#include "circle_layer.hpp"
-
-#include <string>
-
-#include "../conversion/property_value.hpp"
-#include "../conversion/transition_options.hpp"
-
-#include <mbgl/style/layer_impl.hpp>
-
-namespace mbgl {
-namespace android {
-
-    inline mbgl::style::CircleLayer& toCircleLayer(mbgl::style::Layer& layer) {
-        return static_cast<mbgl::style::CircleLayer&>(layer);
-    }
-
-    /**
-     * Creates an owning peer object (for layers not attached to the map) from the JVM side
-     */
-    CircleLayer::CircleLayer(jni::JNIEnv& env, jni::String& layerId, jni::String& sourceId)
-        : Layer(std::make_unique<mbgl::style::CircleLayer>(jni::Make<std::string>(env, layerId), jni::Make<std::string>(env, sourceId))) {
-    }
-
-    /**
-     * Creates a non-owning peer object (for layers currently attached to the map)
-     */
-    CircleLayer::CircleLayer(mbgl::style::CircleLayer& coreLayer) : Layer(coreLayer) {}
-
-    /**
-     * Creates an owning peer object (for layers not attached to the map)
-     */
-    CircleLayer::CircleLayer(std::unique_ptr<mbgl::style::CircleLayer> coreLayer) : Layer(std::move(coreLayer)) {}
-
-    CircleLayer::~CircleLayer() = default;
-
-    // Property getters
-
-    jni::Local<jni::Object<>> CircleLayer::getCircleRadius(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        return std::move(*convert<jni::Local<jni::Object<>>>(env, toCircleLayer(layer).getCircleRadius()));
-    }
-
-    jni::Local<jni::Object<TransitionOptions>> CircleLayer::getCircleRadiusTransition(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        mbgl::style::TransitionOptions options = toCircleLayer(layer).getCircleRadiusTransition();
-        return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, options));
-    }
-
-    void CircleLayer::setCircleRadiusTransition(jni::JNIEnv&, jlong duration, jlong delay) {
-        mbgl::style::TransitionOptions options;
-        options.duration.emplace(mbgl::Milliseconds(duration));
-        options.delay.emplace(mbgl::Milliseconds(delay));
-        toCircleLayer(layer).setCircleRadiusTransition(options);
-    }
-
-    jni::Local<jni::Object<>> CircleLayer::getCircleColor(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        return std::move(*convert<jni::Local<jni::Object<>>>(env, toCircleLayer(layer).getCircleColor()));
-    }
-
-    jni::Local<jni::Object<TransitionOptions>> CircleLayer::getCircleColorTransition(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        mbgl::style::TransitionOptions options = toCircleLayer(layer).getCircleColorTransition();
-        return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, options));
-    }
-
-    void CircleLayer::setCircleColorTransition(jni::JNIEnv&, jlong duration, jlong delay) {
-        mbgl::style::TransitionOptions options;
-        options.duration.emplace(mbgl::Milliseconds(duration));
-        options.delay.emplace(mbgl::Milliseconds(delay));
-        toCircleLayer(layer).setCircleColorTransition(options);
-    }
-
-    jni::Local<jni::Object<>> CircleLayer::getCircleBlur(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        return std::move(*convert<jni::Local<jni::Object<>>>(env, toCircleLayer(layer).getCircleBlur()));
-    }
-
-    jni::Local<jni::Object<TransitionOptions>> CircleLayer::getCircleBlurTransition(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        mbgl::style::TransitionOptions options = toCircleLayer(layer).getCircleBlurTransition();
-        return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, options));
-    }
-
-    void CircleLayer::setCircleBlurTransition(jni::JNIEnv&, jlong duration, jlong delay) {
-        mbgl::style::TransitionOptions options;
-        options.duration.emplace(mbgl::Milliseconds(duration));
-        options.delay.emplace(mbgl::Milliseconds(delay));
-        toCircleLayer(layer).setCircleBlurTransition(options);
-    }
-
-    jni::Local<jni::Object<>> CircleLayer::getCircleOpacity(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        return std::move(*convert<jni::Local<jni::Object<>>>(env, toCircleLayer(layer).getCircleOpacity()));
-    }
-
-    jni::Local<jni::Object<TransitionOptions>> CircleLayer::getCircleOpacityTransition(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        mbgl::style::TransitionOptions options = toCircleLayer(layer).getCircleOpacityTransition();
-        return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, options));
-    }
-
-    void CircleLayer::setCircleOpacityTransition(jni::JNIEnv&, jlong duration, jlong delay) {
-        mbgl::style::TransitionOptions options;
-        options.duration.emplace(mbgl::Milliseconds(duration));
-        options.delay.emplace(mbgl::Milliseconds(delay));
-        toCircleLayer(layer).setCircleOpacityTransition(options);
-    }
-
-    jni::Local<jni::Object<>> CircleLayer::getCircleTranslate(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        return std::move(*convert<jni::Local<jni::Object<>>>(env, toCircleLayer(layer).getCircleTranslate()));
-    }
-
-    jni::Local<jni::Object<TransitionOptions>> CircleLayer::getCircleTranslateTransition(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        mbgl::style::TransitionOptions options = toCircleLayer(layer).getCircleTranslateTransition();
-        return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, options));
-    }
-
-    void CircleLayer::setCircleTranslateTransition(jni::JNIEnv&, jlong duration, jlong delay) {
-        mbgl::style::TransitionOptions options;
-        options.duration.emplace(mbgl::Milliseconds(duration));
-        options.delay.emplace(mbgl::Milliseconds(delay));
-        toCircleLayer(layer).setCircleTranslateTransition(options);
-    }
-
-    jni::Local<jni::Object<>> CircleLayer::getCircleTranslateAnchor(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        return std::move(*convert<jni::Local<jni::Object<>>>(env, toCircleLayer(layer).getCircleTranslateAnchor()));
-    }
-
-    jni::Local<jni::Object<>> CircleLayer::getCirclePitchScale(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        return std::move(*convert<jni::Local<jni::Object<>>>(env, toCircleLayer(layer).getCirclePitchScale()));
-    }
-
-    jni::Local<jni::Object<>> CircleLayer::getCirclePitchAlignment(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        return std::move(*convert<jni::Local<jni::Object<>>>(env, toCircleLayer(layer).getCirclePitchAlignment()));
-    }
-
-    jni::Local<jni::Object<>> CircleLayer::getCircleStrokeWidth(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        return std::move(*convert<jni::Local<jni::Object<>>>(env, toCircleLayer(layer).getCircleStrokeWidth()));
-    }
-
-    jni::Local<jni::Object<TransitionOptions>> CircleLayer::getCircleStrokeWidthTransition(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        mbgl::style::TransitionOptions options = toCircleLayer(layer).getCircleStrokeWidthTransition();
-        return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, options));
-    }
-
-    void CircleLayer::setCircleStrokeWidthTransition(jni::JNIEnv&, jlong duration, jlong delay) {
-        mbgl::style::TransitionOptions options;
-        options.duration.emplace(mbgl::Milliseconds(duration));
-        options.delay.emplace(mbgl::Milliseconds(delay));
-        toCircleLayer(layer).setCircleStrokeWidthTransition(options);
-    }
-
-    jni::Local<jni::Object<>> CircleLayer::getCircleStrokeColor(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        return std::move(*convert<jni::Local<jni::Object<>>>(env, toCircleLayer(layer).getCircleStrokeColor()));
-    }
-
-    jni::Local<jni::Object<TransitionOptions>> CircleLayer::getCircleStrokeColorTransition(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        mbgl::style::TransitionOptions options = toCircleLayer(layer).getCircleStrokeColorTransition();
-        return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, options));
-    }
-
-    void CircleLayer::setCircleStrokeColorTransition(jni::JNIEnv&, jlong duration, jlong delay) {
-        mbgl::style::TransitionOptions options;
-        options.duration.emplace(mbgl::Milliseconds(duration));
-        options.delay.emplace(mbgl::Milliseconds(delay));
-        toCircleLayer(layer).setCircleStrokeColorTransition(options);
-    }
-
-    jni::Local<jni::Object<>> CircleLayer::getCircleStrokeOpacity(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        return std::move(*convert<jni::Local<jni::Object<>>>(env, toCircleLayer(layer).getCircleStrokeOpacity()));
-    }
-
-    jni::Local<jni::Object<TransitionOptions>> CircleLayer::getCircleStrokeOpacityTransition(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        mbgl::style::TransitionOptions options = toCircleLayer(layer).getCircleStrokeOpacityTransition();
-        return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, options));
-    }
-
-    void CircleLayer::setCircleStrokeOpacityTransition(jni::JNIEnv&, jlong duration, jlong delay) {
-        mbgl::style::TransitionOptions options;
-        options.duration.emplace(mbgl::Milliseconds(duration));
-        options.delay.emplace(mbgl::Milliseconds(delay));
-        toCircleLayer(layer).setCircleStrokeOpacityTransition(options);
-    }
-
-
-    // CircleJavaLayerPeerFactory
-
-    CircleJavaLayerPeerFactory::~CircleJavaLayerPeerFactory() = default;
-
-    namespace {
-        jni::Local<jni::Object<Layer>> createJavaPeer(jni::JNIEnv& env, Layer* layer) {
-            static auto& javaClass = jni::Class<CircleLayer>::Singleton(env);
-            static auto constructor = javaClass.GetConstructor<jni::jlong>(env);
-            return javaClass.New(env, constructor, reinterpret_cast<jni::jlong>(layer));
-        }
-    }  // namespace
-
-    jni::Local<jni::Object<Layer>> CircleJavaLayerPeerFactory::createJavaLayerPeer(jni::JNIEnv& env,
-                                                                                   mbgl::style::Layer& layer) {
-        assert(layer.baseImpl->getTypeInfo() == getTypeInfo());
-        return createJavaPeer(env, new CircleLayer(toCircleLayer(layer)));
-    }
-
-    jni::Local<jni::Object<Layer>> CircleJavaLayerPeerFactory::createJavaLayerPeer(
-        jni::JNIEnv& env, std::unique_ptr<mbgl::style::Layer> layer) {
-        assert(layer->baseImpl->getTypeInfo() == getTypeInfo());
-        return createJavaPeer(env,
-                              new CircleLayer(std::unique_ptr<mbgl::style::CircleLayer>(
-                                  static_cast<mbgl::style::CircleLayer*>(layer.release()))));
-    }
-
-    void CircleJavaLayerPeerFactory::registerNative(jni::JNIEnv& env) {
-        // Lookup the class
-        static auto& javaClass = jni::Class<CircleLayer>::Singleton(env);
-
-        #define METHOD(MethodPtr, name) jni::MakeNativePeerMethod<decltype(MethodPtr), (MethodPtr)>(name)
-
-        // Register the peer
-        jni::RegisterNativePeer<CircleLayer>(
-            env,
-            javaClass,
-            "nativePtr",
-            jni::MakePeer<CircleLayer, jni::String&, jni::String&>,
-            "initialize",
-            "finalize",
-            METHOD(&CircleLayer::getCircleRadiusTransition, "nativeGetCircleRadiusTransition"),
-            METHOD(&CircleLayer::setCircleRadiusTransition, "nativeSetCircleRadiusTransition"),
-            METHOD(&CircleLayer::getCircleRadius, "nativeGetCircleRadius"),
-            METHOD(&CircleLayer::getCircleColorTransition, "nativeGetCircleColorTransition"),
-            METHOD(&CircleLayer::setCircleColorTransition, "nativeSetCircleColorTransition"),
-            METHOD(&CircleLayer::getCircleColor, "nativeGetCircleColor"),
-            METHOD(&CircleLayer::getCircleBlurTransition, "nativeGetCircleBlurTransition"),
-            METHOD(&CircleLayer::setCircleBlurTransition, "nativeSetCircleBlurTransition"),
-            METHOD(&CircleLayer::getCircleBlur, "nativeGetCircleBlur"),
-            METHOD(&CircleLayer::getCircleOpacityTransition, "nativeGetCircleOpacityTransition"),
-            METHOD(&CircleLayer::setCircleOpacityTransition, "nativeSetCircleOpacityTransition"),
-            METHOD(&CircleLayer::getCircleOpacity, "nativeGetCircleOpacity"),
-            METHOD(&CircleLayer::getCircleTranslateTransition, "nativeGetCircleTranslateTransition"),
-            METHOD(&CircleLayer::setCircleTranslateTransition, "nativeSetCircleTranslateTransition"),
-            METHOD(&CircleLayer::getCircleTranslate, "nativeGetCircleTranslate"),
-            METHOD(&CircleLayer::getCircleTranslateAnchor, "nativeGetCircleTranslateAnchor"),
-            METHOD(&CircleLayer::getCirclePitchScale, "nativeGetCirclePitchScale"),
-            METHOD(&CircleLayer::getCirclePitchAlignment, "nativeGetCirclePitchAlignment"),
-            METHOD(&CircleLayer::getCircleStrokeWidthTransition, "nativeGetCircleStrokeWidthTransition"),
-            METHOD(&CircleLayer::setCircleStrokeWidthTransition, "nativeSetCircleStrokeWidthTransition"),
-            METHOD(&CircleLayer::getCircleStrokeWidth, "nativeGetCircleStrokeWidth"),
-            METHOD(&CircleLayer::getCircleStrokeColorTransition, "nativeGetCircleStrokeColorTransition"),
-            METHOD(&CircleLayer::setCircleStrokeColorTransition, "nativeSetCircleStrokeColorTransition"),
-            METHOD(&CircleLayer::getCircleStrokeColor, "nativeGetCircleStrokeColor"),
-            METHOD(&CircleLayer::getCircleStrokeOpacityTransition, "nativeGetCircleStrokeOpacityTransition"),
-            METHOD(&CircleLayer::setCircleStrokeOpacityTransition, "nativeSetCircleStrokeOpacityTransition"),
-            METHOD(&CircleLayer::getCircleStrokeOpacity, "nativeGetCircleStrokeOpacity"));
-    }
-
-} // namespace android
-} // namespace mbgl
diff --git a/platform/android/src/style/layers/circle_layer.hpp b/platform/android/src/style/layers/circle_layer.hpp
deleted file mode 100644
index 40dca91e2e..0000000000
--- a/platform/android/src/style/layers/circle_layer.hpp
+++ /dev/null
@@ -1,84 +0,0 @@
-// This file is generated. Edit android/platform/scripts/generate-style-code.js, then run `make android-style-code`.
-
-#pragma once
-
-#include "layer.hpp"
-#include "../transition_options.hpp"
-#include <mbgl/layermanager/circle_layer_factory.hpp>
-#include <mbgl/style/layers/circle_layer.hpp>
-#include <jni/jni.hpp>
-
-namespace mbgl {
-namespace android {
-
-class CircleLayer : public Layer {
-public:
-    using SuperTag = Layer;
-    static constexpr auto Name() { return "com/mapbox/mapboxsdk/style/layers/CircleLayer"; };
-
-    CircleLayer(jni::JNIEnv&, jni::String&, jni::String&);
-
-    CircleLayer(mbgl::style::CircleLayer&);
-
-    CircleLayer(std::unique_ptr<mbgl::style::CircleLayer>);
-
-    ~CircleLayer();
-
-    // Properties
-
-    jni::Local<jni::Object<jni::ObjectTag>> getCircleRadius(jni::JNIEnv&);
-    void setCircleRadiusTransition(jni::JNIEnv&, jlong duration, jlong delay);
-    jni::Local<jni::Object<TransitionOptions>> getCircleRadiusTransition(jni::JNIEnv&);
-
-    jni::Local<jni::Object<jni::ObjectTag>> getCircleColor(jni::JNIEnv&);
-    void setCircleColorTransition(jni::JNIEnv&, jlong duration, jlong delay);
-    jni::Local<jni::Object<TransitionOptions>> getCircleColorTransition(jni::JNIEnv&);
-
-    jni::Local<jni::Object<jni::ObjectTag>> getCircleBlur(jni::JNIEnv&);
-    void setCircleBlurTransition(jni::JNIEnv&, jlong duration, jlong delay);
-    jni::Local<jni::Object<TransitionOptions>> getCircleBlurTransition(jni::JNIEnv&);
-
-    jni::Local<jni::Object<jni::ObjectTag>> getCircleOpacity(jni::JNIEnv&);
-    void setCircleOpacityTransition(jni::JNIEnv&, jlong duration, jlong delay);
-    jni::Local<jni::Object<TransitionOptions>> getCircleOpacityTransition(jni::JNIEnv&);
-
-    jni::Local<jni::Object<jni::ObjectTag>> getCircleTranslate(jni::JNIEnv&);
-    void setCircleTranslateTransition(jni::JNIEnv&, jlong duration, jlong delay);
-    jni::Local<jni::Object<TransitionOptions>> getCircleTranslateTransition(jni::JNIEnv&);
-
-    jni::Local<jni::Object<jni::ObjectTag>> getCircleTranslateAnchor(jni::JNIEnv&);
-
-    jni::Local<jni::Object<jni::ObjectTag>> getCirclePitchScale(jni::JNIEnv&);
-
-    jni::Local<jni::Object<jni::ObjectTag>> getCirclePitchAlignment(jni::JNIEnv&);
-
-    jni::Local<jni::Object<jni::ObjectTag>> getCircleStrokeWidth(jni::JNIEnv&);
-    void setCircleStrokeWidthTransition(jni::JNIEnv&, jlong duration, jlong delay);
-    jni::Local<jni::Object<TransitionOptions>> getCircleStrokeWidthTransition(jni::JNIEnv&);
-
-    jni::Local<jni::Object<jni::ObjectTag>> getCircleStrokeColor(jni::JNIEnv&);
-    void setCircleStrokeColorTransition(jni::JNIEnv&, jlong duration, jlong delay);
-    jni::Local<jni::Object<TransitionOptions>> getCircleStrokeColorTransition(jni::JNIEnv&);
-
-    jni::Local<jni::Object<jni::ObjectTag>> getCircleStrokeOpacity(jni::JNIEnv&);
-    void setCircleStrokeOpacityTransition(jni::JNIEnv&, jlong duration, jlong delay);
-    jni::Local<jni::Object<TransitionOptions>> getCircleStrokeOpacityTransition(jni::JNIEnv&);
-
-}; // class CircleLayer
-
-class CircleJavaLayerPeerFactory final : public JavaLayerPeerFactory,  public mbgl::CircleLayerFactory {
-public:
-    ~CircleJavaLayerPeerFactory() override;
-
-    // JavaLayerPeerFactory overrides.
-    jni::Local<jni::Object<Layer>> createJavaLayerPeer(jni::JNIEnv&, mbgl::style::Layer&) final;
-    jni::Local<jni::Object<Layer>> createJavaLayerPeer(jni::JNIEnv& env, std::unique_ptr<mbgl::style::Layer>) final;
-
-    void registerNative(jni::JNIEnv&) final;
-
-    LayerFactory* getLayerFactory() final { return this; }
-
-};  // class CircleJavaLayerPeerFactory
-
-} // namespace android
-} // namespace mbgl
diff --git a/platform/android/src/style/layers/custom_layer.cpp b/platform/android/src/style/layers/custom_layer.cpp
deleted file mode 100644
index 5a8b239a8d..0000000000
--- a/platform/android/src/style/layers/custom_layer.cpp
+++ /dev/null
@@ -1,61 +0,0 @@
-#include "custom_layer.hpp"
-
-#include <string>
-
-#include <mbgl/util/logging.hpp>
-
-namespace mbgl {
-namespace android {
-
-    CustomLayer::CustomLayer(jni::JNIEnv& env, const jni::String& layerId, jni::jlong host)
-        : Layer(std::make_unique<mbgl::style::CustomLayer>(
-                jni::Make<std::string>(env, layerId),
-                std::unique_ptr<mbgl::style::CustomLayerHost>(reinterpret_cast<mbgl::style::CustomLayerHost*>(host)))
-                ) {
-    }
-
-    CustomLayer::CustomLayer(mbgl::style::CustomLayer& coreLayer) : Layer(coreLayer) {}
-
-    CustomLayer::CustomLayer(std::unique_ptr<mbgl::style::CustomLayer> coreLayer) : Layer(std::move(coreLayer)) {}
-
-    CustomLayer::~CustomLayer() = default;
-
-    namespace {
-        jni::Local<jni::Object<Layer>> createJavaPeer(jni::JNIEnv& env, Layer* layer) {
-            static auto& javaClass = jni::Class<CustomLayer>::Singleton(env);
-            static auto constructor = javaClass.GetConstructor<jni::jlong>(env);
-            return javaClass.New(env, constructor, reinterpret_cast<jni::jlong>(layer));
-        }
-    }
-
-    CustomJavaLayerPeerFactory::~CustomJavaLayerPeerFactory() = default;
-
-    jni::Local<jni::Object<Layer>> CustomJavaLayerPeerFactory::createJavaLayerPeer(jni::JNIEnv& env,
-                                                                                   mbgl::style::Layer& layer) {
-        return createJavaPeer(env, new CustomLayer(static_cast<mbgl::style::CustomLayer&>(layer)));
-    }
-
-    jni::Local<jni::Object<Layer>> CustomJavaLayerPeerFactory::createJavaLayerPeer(
-        jni::JNIEnv& env, std::unique_ptr<mbgl::style::Layer> layer) {
-        return createJavaPeer(env,
-                              new CustomLayer(std::unique_ptr<mbgl::style::CustomLayer>(
-                                  static_cast<mbgl::style::CustomLayer*>(layer.release()))));
-    }
-
-    void CustomJavaLayerPeerFactory::registerNative(jni::JNIEnv& env) {
-        // Lookup the class
-        static auto& javaClass = jni::Class<CustomLayer>::Singleton(env);
-
-        #define METHOD(MethodPtr, name) jni::MakeNativePeerMethod<decltype(MethodPtr), (MethodPtr)>(name)
-
-        // Register the peer
-        jni::RegisterNativePeer<CustomLayer>(env,
-                                             javaClass,
-                                             "nativePtr",
-                                             jni::MakePeer<CustomLayer, const jni::String&, jni::jlong>,
-                                             "initialize",
-                                             "finalize");
-    }
-
-} // namespace android
-} // namespace mbgl
diff --git a/platform/android/src/style/layers/custom_layer.hpp b/platform/android/src/style/layers/custom_layer.hpp
deleted file mode 100644
index 3856ea73ae..0000000000
--- a/platform/android/src/style/layers/custom_layer.hpp
+++ /dev/null
@@ -1,41 +0,0 @@
-#pragma once
-
-#include <jni/jni.hpp>
-#include <mbgl/gl/custom_layer.hpp>
-#include <mbgl/gl/custom_layer_factory.hpp>
-#include "layer.hpp"
-
-namespace mbgl {
-namespace android {
-
-class CustomLayer : public Layer {
-public:
-    using SuperTag = Layer;
-    static constexpr auto Name() { return "com/mapbox/mapboxsdk/style/layers/CustomLayer"; };
-
-    static void registerNative(jni::JNIEnv&);
-
-    CustomLayer(jni::JNIEnv&, const jni::String&, jni::jlong);
-    CustomLayer(mbgl::style::CustomLayer&);
-    CustomLayer(std::unique_ptr<mbgl::style::CustomLayer>);
-    ~CustomLayer();
-
-    jni::Local<jni::Object<Layer>> createJavaPeer(jni::JNIEnv&);
-}; // class CustomLayer
-
-class CustomJavaLayerPeerFactory final : public JavaLayerPeerFactory,  public mbgl::CustomLayerFactory {
-public:
-    ~CustomJavaLayerPeerFactory() override;
-
-    // JavaLayerPeerFactory overrides.
-    jni::Local<jni::Object<Layer>> createJavaLayerPeer(jni::JNIEnv&, mbgl::style::Layer&) final;
-    jni::Local<jni::Object<Layer>> createJavaLayerPeer(jni::JNIEnv& env, std::unique_ptr<mbgl::style::Layer>) final;
-
-    void registerNative(jni::JNIEnv&) final;
-
-    LayerFactory* getLayerFactory() final { return this; }
-
-};  // class CustomJavaLayerPeerFactory
-
-} // namespace android
-} // namespace mbgl
diff --git a/platform/android/src/style/layers/fill_extrusion_layer.cpp b/platform/android/src/style/layers/fill_extrusion_layer.cpp
deleted file mode 100644
index 55c3d20282..0000000000
--- a/platform/android/src/style/layers/fill_extrusion_layer.cpp
+++ /dev/null
@@ -1,225 +0,0 @@
-// This file is generated. Edit android/platform/scripts/generate-style-code.js, then run `make android-style-code`.
-
-#include "fill_extrusion_layer.hpp"
-
-#include <string>
-
-#include "../conversion/property_value.hpp"
-#include "../conversion/transition_options.hpp"
-
-#include <mbgl/style/layer_impl.hpp>
-
-namespace mbgl {
-namespace android {
-
-    inline mbgl::style::FillExtrusionLayer& toFillExtrusionLayer(mbgl::style::Layer& layer) {
-        return static_cast<mbgl::style::FillExtrusionLayer&>(layer);
-    }
-
-    /**
-     * Creates an owning peer object (for layers not attached to the map) from the JVM side
-     */
-    FillExtrusionLayer::FillExtrusionLayer(jni::JNIEnv& env, jni::String& layerId, jni::String& sourceId)
-        : Layer(std::make_unique<mbgl::style::FillExtrusionLayer>(jni::Make<std::string>(env, layerId), jni::Make<std::string>(env, sourceId))) {
-    }
-
-    /**
-     * Creates a non-owning peer object (for layers currently attached to the map)
-     */
-    FillExtrusionLayer::FillExtrusionLayer(mbgl::style::FillExtrusionLayer& coreLayer) : Layer(coreLayer) {}
-
-    /**
-     * Creates an owning peer object (for layers not attached to the map)
-     */
-    FillExtrusionLayer::FillExtrusionLayer(std::unique_ptr<mbgl::style::FillExtrusionLayer> coreLayer)
-        : Layer(std::move(coreLayer)) {}
-
-    FillExtrusionLayer::~FillExtrusionLayer() = default;
-
-    // Property getters
-
-    jni::Local<jni::Object<>> FillExtrusionLayer::getFillExtrusionOpacity(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        return std::move(*convert<jni::Local<jni::Object<>>>(env, toFillExtrusionLayer(layer).getFillExtrusionOpacity()));
-    }
-
-    jni::Local<jni::Object<TransitionOptions>> FillExtrusionLayer::getFillExtrusionOpacityTransition(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        mbgl::style::TransitionOptions options = toFillExtrusionLayer(layer).getFillExtrusionOpacityTransition();
-        return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, options));
-    }
-
-    void FillExtrusionLayer::setFillExtrusionOpacityTransition(jni::JNIEnv&, jlong duration, jlong delay) {
-        mbgl::style::TransitionOptions options;
-        options.duration.emplace(mbgl::Milliseconds(duration));
-        options.delay.emplace(mbgl::Milliseconds(delay));
-        toFillExtrusionLayer(layer).setFillExtrusionOpacityTransition(options);
-    }
-
-    jni::Local<jni::Object<>> FillExtrusionLayer::getFillExtrusionColor(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        return std::move(*convert<jni::Local<jni::Object<>>>(env, toFillExtrusionLayer(layer).getFillExtrusionColor()));
-    }
-
-    jni::Local<jni::Object<TransitionOptions>> FillExtrusionLayer::getFillExtrusionColorTransition(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        mbgl::style::TransitionOptions options = toFillExtrusionLayer(layer).getFillExtrusionColorTransition();
-        return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, options));
-    }
-
-    void FillExtrusionLayer::setFillExtrusionColorTransition(jni::JNIEnv&, jlong duration, jlong delay) {
-        mbgl::style::TransitionOptions options;
-        options.duration.emplace(mbgl::Milliseconds(duration));
-        options.delay.emplace(mbgl::Milliseconds(delay));
-        toFillExtrusionLayer(layer).setFillExtrusionColorTransition(options);
-    }
-
-    jni::Local<jni::Object<>> FillExtrusionLayer::getFillExtrusionTranslate(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        return std::move(*convert<jni::Local<jni::Object<>>>(env, toFillExtrusionLayer(layer).getFillExtrusionTranslate()));
-    }
-
-    jni::Local<jni::Object<TransitionOptions>> FillExtrusionLayer::getFillExtrusionTranslateTransition(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        mbgl::style::TransitionOptions options = toFillExtrusionLayer(layer).getFillExtrusionTranslateTransition();
-        return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, options));
-    }
-
-    void FillExtrusionLayer::setFillExtrusionTranslateTransition(jni::JNIEnv&, jlong duration, jlong delay) {
-        mbgl::style::TransitionOptions options;
-        options.duration.emplace(mbgl::Milliseconds(duration));
-        options.delay.emplace(mbgl::Milliseconds(delay));
-        toFillExtrusionLayer(layer).setFillExtrusionTranslateTransition(options);
-    }
-
-    jni::Local<jni::Object<>> FillExtrusionLayer::getFillExtrusionTranslateAnchor(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        return std::move(*convert<jni::Local<jni::Object<>>>(env, toFillExtrusionLayer(layer).getFillExtrusionTranslateAnchor()));
-    }
-
-    jni::Local<jni::Object<>> FillExtrusionLayer::getFillExtrusionPattern(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        return std::move(*convert<jni::Local<jni::Object<>>>(env, toFillExtrusionLayer(layer).getFillExtrusionPattern()));
-    }
-
-    jni::Local<jni::Object<TransitionOptions>> FillExtrusionLayer::getFillExtrusionPatternTransition(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        mbgl::style::TransitionOptions options = toFillExtrusionLayer(layer).getFillExtrusionPatternTransition();
-        return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, options));
-    }
-
-    void FillExtrusionLayer::setFillExtrusionPatternTransition(jni::JNIEnv&, jlong duration, jlong delay) {
-        mbgl::style::TransitionOptions options;
-        options.duration.emplace(mbgl::Milliseconds(duration));
-        options.delay.emplace(mbgl::Milliseconds(delay));
-        toFillExtrusionLayer(layer).setFillExtrusionPatternTransition(options);
-    }
-
-    jni::Local<jni::Object<>> FillExtrusionLayer::getFillExtrusionHeight(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        return std::move(*convert<jni::Local<jni::Object<>>>(env, toFillExtrusionLayer(layer).getFillExtrusionHeight()));
-    }
-
-    jni::Local<jni::Object<TransitionOptions>> FillExtrusionLayer::getFillExtrusionHeightTransition(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        mbgl::style::TransitionOptions options = toFillExtrusionLayer(layer).getFillExtrusionHeightTransition();
-        return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, options));
-    }
-
-    void FillExtrusionLayer::setFillExtrusionHeightTransition(jni::JNIEnv&, jlong duration, jlong delay) {
-        mbgl::style::TransitionOptions options;
-        options.duration.emplace(mbgl::Milliseconds(duration));
-        options.delay.emplace(mbgl::Milliseconds(delay));
-        toFillExtrusionLayer(layer).setFillExtrusionHeightTransition(options);
-    }
-
-    jni::Local<jni::Object<>> FillExtrusionLayer::getFillExtrusionBase(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        return std::move(*convert<jni::Local<jni::Object<>>>(env, toFillExtrusionLayer(layer).getFillExtrusionBase()));
-    }
-
-    jni::Local<jni::Object<TransitionOptions>> FillExtrusionLayer::getFillExtrusionBaseTransition(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        mbgl::style::TransitionOptions options = toFillExtrusionLayer(layer).getFillExtrusionBaseTransition();
-        return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, options));
-    }
-
-    void FillExtrusionLayer::setFillExtrusionBaseTransition(jni::JNIEnv&, jlong duration, jlong delay) {
-        mbgl::style::TransitionOptions options;
-        options.duration.emplace(mbgl::Milliseconds(duration));
-        options.delay.emplace(mbgl::Milliseconds(delay));
-        toFillExtrusionLayer(layer).setFillExtrusionBaseTransition(options);
-    }
-
-    jni::Local<jni::Object<>> FillExtrusionLayer::getFillExtrusionVerticalGradient(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        return std::move(*convert<jni::Local<jni::Object<>>>(env, toFillExtrusionLayer(layer).getFillExtrusionVerticalGradient()));
-    }
-
-
-    // FillExtrusionJavaLayerPeerFactory
-
-    FillExtrusionJavaLayerPeerFactory::~FillExtrusionJavaLayerPeerFactory() = default;
-
-    namespace {
-        jni::Local<jni::Object<Layer>> createJavaPeer(jni::JNIEnv& env, Layer* layer) {
-            static auto& javaClass = jni::Class<FillExtrusionLayer>::Singleton(env);
-            static auto constructor = javaClass.GetConstructor<jni::jlong>(env);
-            return javaClass.New(env, constructor, reinterpret_cast<jni::jlong>(layer));
-        }
-    }  // namespace
-
-    jni::Local<jni::Object<Layer>> FillExtrusionJavaLayerPeerFactory::createJavaLayerPeer(jni::JNIEnv& env,
-                                                                                          mbgl::style::Layer& layer) {
-        assert(layer.baseImpl->getTypeInfo() == getTypeInfo());
-        return createJavaPeer(env, new FillExtrusionLayer(toFillExtrusionLayer(layer)));
-    }
-
-    jni::Local<jni::Object<Layer>> FillExtrusionJavaLayerPeerFactory::createJavaLayerPeer(
-        jni::JNIEnv& env, std::unique_ptr<mbgl::style::Layer> layer) {
-        assert(layer->baseImpl->getTypeInfo() == getTypeInfo());
-        return createJavaPeer(env,
-                              new FillExtrusionLayer(std::unique_ptr<mbgl::style::FillExtrusionLayer>(
-                                  static_cast<mbgl::style::FillExtrusionLayer*>(layer.release()))));
-    }
-
-    void FillExtrusionJavaLayerPeerFactory::registerNative(jni::JNIEnv& env) {
-        // Lookup the class
-        static auto& javaClass = jni::Class<FillExtrusionLayer>::Singleton(env);
-
-        #define METHOD(MethodPtr, name) jni::MakeNativePeerMethod<decltype(MethodPtr), (MethodPtr)>(name)
-
-        // Register the peer
-        jni::RegisterNativePeer<FillExtrusionLayer>(
-            env,
-            javaClass,
-            "nativePtr",
-            jni::MakePeer<FillExtrusionLayer, jni::String&, jni::String&>,
-            "initialize",
-            "finalize",
-            METHOD(&FillExtrusionLayer::getFillExtrusionOpacityTransition, "nativeGetFillExtrusionOpacityTransition"),
-            METHOD(&FillExtrusionLayer::setFillExtrusionOpacityTransition, "nativeSetFillExtrusionOpacityTransition"),
-            METHOD(&FillExtrusionLayer::getFillExtrusionOpacity, "nativeGetFillExtrusionOpacity"),
-            METHOD(&FillExtrusionLayer::getFillExtrusionColorTransition, "nativeGetFillExtrusionColorTransition"),
-            METHOD(&FillExtrusionLayer::setFillExtrusionColorTransition, "nativeSetFillExtrusionColorTransition"),
-            METHOD(&FillExtrusionLayer::getFillExtrusionColor, "nativeGetFillExtrusionColor"),
-            METHOD(&FillExtrusionLayer::getFillExtrusionTranslateTransition,
-                   "nativeGetFillExtrusionTranslateTransition"),
-            METHOD(&FillExtrusionLayer::setFillExtrusionTranslateTransition,
-                   "nativeSetFillExtrusionTranslateTransition"),
-            METHOD(&FillExtrusionLayer::getFillExtrusionTranslate, "nativeGetFillExtrusionTranslate"),
-            METHOD(&FillExtrusionLayer::getFillExtrusionTranslateAnchor, "nativeGetFillExtrusionTranslateAnchor"),
-            METHOD(&FillExtrusionLayer::getFillExtrusionPatternTransition, "nativeGetFillExtrusionPatternTransition"),
-            METHOD(&FillExtrusionLayer::setFillExtrusionPatternTransition, "nativeSetFillExtrusionPatternTransition"),
-            METHOD(&FillExtrusionLayer::getFillExtrusionPattern, "nativeGetFillExtrusionPattern"),
-            METHOD(&FillExtrusionLayer::getFillExtrusionHeightTransition, "nativeGetFillExtrusionHeightTransition"),
-            METHOD(&FillExtrusionLayer::setFillExtrusionHeightTransition, "nativeSetFillExtrusionHeightTransition"),
-            METHOD(&FillExtrusionLayer::getFillExtrusionHeight, "nativeGetFillExtrusionHeight"),
-            METHOD(&FillExtrusionLayer::getFillExtrusionBaseTransition, "nativeGetFillExtrusionBaseTransition"),
-            METHOD(&FillExtrusionLayer::setFillExtrusionBaseTransition, "nativeSetFillExtrusionBaseTransition"),
-            METHOD(&FillExtrusionLayer::getFillExtrusionBase, "nativeGetFillExtrusionBase"),
-            METHOD(&FillExtrusionLayer::getFillExtrusionVerticalGradient, "nativeGetFillExtrusionVerticalGradient"));
-    }
-
-} // namespace android
-} // namespace mbgl
diff --git a/platform/android/src/style/layers/fill_extrusion_layer.hpp b/platform/android/src/style/layers/fill_extrusion_layer.hpp
deleted file mode 100644
index 6f0a24131c..0000000000
--- a/platform/android/src/style/layers/fill_extrusion_layer.hpp
+++ /dev/null
@@ -1,74 +0,0 @@
-// This file is generated. Edit android/platform/scripts/generate-style-code.js, then run `make android-style-code`.
-
-#pragma once
-
-#include "layer.hpp"
-#include "../transition_options.hpp"
-#include <mbgl/layermanager/fill_extrusion_layer_factory.hpp>
-#include <mbgl/style/layers/fill_extrusion_layer.hpp>
-#include <jni/jni.hpp>
-
-namespace mbgl {
-namespace android {
-
-class FillExtrusionLayer : public Layer {
-public:
-    using SuperTag = Layer;
-    static constexpr auto Name() { return "com/mapbox/mapboxsdk/style/layers/FillExtrusionLayer"; };
-
-    FillExtrusionLayer(jni::JNIEnv&, jni::String&, jni::String&);
-
-    FillExtrusionLayer(mbgl::style::FillExtrusionLayer&);
-
-    FillExtrusionLayer(std::unique_ptr<mbgl::style::FillExtrusionLayer>);
-
-    ~FillExtrusionLayer();
-
-    // Properties
-
-    jni::Local<jni::Object<jni::ObjectTag>> getFillExtrusionOpacity(jni::JNIEnv&);
-    void setFillExtrusionOpacityTransition(jni::JNIEnv&, jlong duration, jlong delay);
-    jni::Local<jni::Object<TransitionOptions>> getFillExtrusionOpacityTransition(jni::JNIEnv&);
-
-    jni::Local<jni::Object<jni::ObjectTag>> getFillExtrusionColor(jni::JNIEnv&);
-    void setFillExtrusionColorTransition(jni::JNIEnv&, jlong duration, jlong delay);
-    jni::Local<jni::Object<TransitionOptions>> getFillExtrusionColorTransition(jni::JNIEnv&);
-
-    jni::Local<jni::Object<jni::ObjectTag>> getFillExtrusionTranslate(jni::JNIEnv&);
-    void setFillExtrusionTranslateTransition(jni::JNIEnv&, jlong duration, jlong delay);
-    jni::Local<jni::Object<TransitionOptions>> getFillExtrusionTranslateTransition(jni::JNIEnv&);
-
-    jni::Local<jni::Object<jni::ObjectTag>> getFillExtrusionTranslateAnchor(jni::JNIEnv&);
-
-    jni::Local<jni::Object<jni::ObjectTag>> getFillExtrusionPattern(jni::JNIEnv&);
-    void setFillExtrusionPatternTransition(jni::JNIEnv&, jlong duration, jlong delay);
-    jni::Local<jni::Object<TransitionOptions>> getFillExtrusionPatternTransition(jni::JNIEnv&);
-
-    jni::Local<jni::Object<jni::ObjectTag>> getFillExtrusionHeight(jni::JNIEnv&);
-    void setFillExtrusionHeightTransition(jni::JNIEnv&, jlong duration, jlong delay);
-    jni::Local<jni::Object<TransitionOptions>> getFillExtrusionHeightTransition(jni::JNIEnv&);
-
-    jni::Local<jni::Object<jni::ObjectTag>> getFillExtrusionBase(jni::JNIEnv&);
-    void setFillExtrusionBaseTransition(jni::JNIEnv&, jlong duration, jlong delay);
-    jni::Local<jni::Object<TransitionOptions>> getFillExtrusionBaseTransition(jni::JNIEnv&);
-
-    jni::Local<jni::Object<jni::ObjectTag>> getFillExtrusionVerticalGradient(jni::JNIEnv&);
-
-}; // class FillExtrusionLayer
-
-class FillExtrusionJavaLayerPeerFactory final : public JavaLayerPeerFactory,  public mbgl::FillExtrusionLayerFactory {
-public:
-    ~FillExtrusionJavaLayerPeerFactory() override;
-
-    // JavaLayerPeerFactory overrides.
-    jni::Local<jni::Object<Layer>> createJavaLayerPeer(jni::JNIEnv&, mbgl::style::Layer&) final;
-    jni::Local<jni::Object<Layer>> createJavaLayerPeer(jni::JNIEnv& env, std::unique_ptr<mbgl::style::Layer>) final;
-
-    void registerNative(jni::JNIEnv&) final;
-
-    LayerFactory* getLayerFactory() final { return this; }
-
-};  // class FillExtrusionJavaLayerPeerFactory
-
-} // namespace android
-} // namespace mbgl
diff --git a/platform/android/src/style/layers/fill_layer.cpp b/platform/android/src/style/layers/fill_layer.cpp
deleted file mode 100644
index 6a646fdc7d..0000000000
--- a/platform/android/src/style/layers/fill_layer.cpp
+++ /dev/null
@@ -1,207 +0,0 @@
-// This file is generated. Edit android/platform/scripts/generate-style-code.js, then run `make android-style-code`.
-
-#include "fill_layer.hpp"
-
-#include <string>
-
-#include "../conversion/property_value.hpp"
-#include "../conversion/transition_options.hpp"
-
-#include <mbgl/style/layer_impl.hpp>
-
-namespace mbgl {
-namespace android {
-
-    inline mbgl::style::FillLayer& toFillLayer(mbgl::style::Layer& layer) {
-        return static_cast<mbgl::style::FillLayer&>(layer);
-    }
-
-    /**
-     * Creates an owning peer object (for layers not attached to the map) from the JVM side
-     */
-    FillLayer::FillLayer(jni::JNIEnv& env, jni::String& layerId, jni::String& sourceId)
-        : Layer(std::make_unique<mbgl::style::FillLayer>(jni::Make<std::string>(env, layerId), jni::Make<std::string>(env, sourceId))) {
-    }
-
-    /**
-     * Creates a non-owning peer object (for layers currently attached to the map)
-     */
-    FillLayer::FillLayer(mbgl::style::FillLayer& coreLayer) : Layer(coreLayer) {}
-
-    /**
-     * Creates an owning peer object (for layers not attached to the map)
-     */
-    FillLayer::FillLayer(std::unique_ptr<mbgl::style::FillLayer> coreLayer) : Layer(std::move(coreLayer)) {}
-
-    FillLayer::~FillLayer() = default;
-
-    // Property getters
-
-    jni::Local<jni::Object<>> FillLayer::getFillSortKey(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        return std::move(*convert<jni::Local<jni::Object<>>>(env, toFillLayer(layer).getFillSortKey()));
-    }
-
-    jni::Local<jni::Object<>> FillLayer::getFillAntialias(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        return std::move(*convert<jni::Local<jni::Object<>>>(env, toFillLayer(layer).getFillAntialias()));
-    }
-
-    jni::Local<jni::Object<>> FillLayer::getFillOpacity(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        return std::move(*convert<jni::Local<jni::Object<>>>(env, toFillLayer(layer).getFillOpacity()));
-    }
-
-    jni::Local<jni::Object<TransitionOptions>> FillLayer::getFillOpacityTransition(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        mbgl::style::TransitionOptions options = toFillLayer(layer).getFillOpacityTransition();
-        return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, options));
-    }
-
-    void FillLayer::setFillOpacityTransition(jni::JNIEnv&, jlong duration, jlong delay) {
-        mbgl::style::TransitionOptions options;
-        options.duration.emplace(mbgl::Milliseconds(duration));
-        options.delay.emplace(mbgl::Milliseconds(delay));
-        toFillLayer(layer).setFillOpacityTransition(options);
-    }
-
-    jni::Local<jni::Object<>> FillLayer::getFillColor(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        return std::move(*convert<jni::Local<jni::Object<>>>(env, toFillLayer(layer).getFillColor()));
-    }
-
-    jni::Local<jni::Object<TransitionOptions>> FillLayer::getFillColorTransition(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        mbgl::style::TransitionOptions options = toFillLayer(layer).getFillColorTransition();
-        return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, options));
-    }
-
-    void FillLayer::setFillColorTransition(jni::JNIEnv&, jlong duration, jlong delay) {
-        mbgl::style::TransitionOptions options;
-        options.duration.emplace(mbgl::Milliseconds(duration));
-        options.delay.emplace(mbgl::Milliseconds(delay));
-        toFillLayer(layer).setFillColorTransition(options);
-    }
-
-    jni::Local<jni::Object<>> FillLayer::getFillOutlineColor(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        return std::move(*convert<jni::Local<jni::Object<>>>(env, toFillLayer(layer).getFillOutlineColor()));
-    }
-
-    jni::Local<jni::Object<TransitionOptions>> FillLayer::getFillOutlineColorTransition(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        mbgl::style::TransitionOptions options = toFillLayer(layer).getFillOutlineColorTransition();
-        return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, options));
-    }
-
-    void FillLayer::setFillOutlineColorTransition(jni::JNIEnv&, jlong duration, jlong delay) {
-        mbgl::style::TransitionOptions options;
-        options.duration.emplace(mbgl::Milliseconds(duration));
-        options.delay.emplace(mbgl::Milliseconds(delay));
-        toFillLayer(layer).setFillOutlineColorTransition(options);
-    }
-
-    jni::Local<jni::Object<>> FillLayer::getFillTranslate(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        return std::move(*convert<jni::Local<jni::Object<>>>(env, toFillLayer(layer).getFillTranslate()));
-    }
-
-    jni::Local<jni::Object<TransitionOptions>> FillLayer::getFillTranslateTransition(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        mbgl::style::TransitionOptions options = toFillLayer(layer).getFillTranslateTransition();
-        return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, options));
-    }
-
-    void FillLayer::setFillTranslateTransition(jni::JNIEnv&, jlong duration, jlong delay) {
-        mbgl::style::TransitionOptions options;
-        options.duration.emplace(mbgl::Milliseconds(duration));
-        options.delay.emplace(mbgl::Milliseconds(delay));
-        toFillLayer(layer).setFillTranslateTransition(options);
-    }
-
-    jni::Local<jni::Object<>> FillLayer::getFillTranslateAnchor(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        return std::move(*convert<jni::Local<jni::Object<>>>(env, toFillLayer(layer).getFillTranslateAnchor()));
-    }
-
-    jni::Local<jni::Object<>> FillLayer::getFillPattern(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        return std::move(*convert<jni::Local<jni::Object<>>>(env, toFillLayer(layer).getFillPattern()));
-    }
-
-    jni::Local<jni::Object<TransitionOptions>> FillLayer::getFillPatternTransition(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        mbgl::style::TransitionOptions options = toFillLayer(layer).getFillPatternTransition();
-        return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, options));
-    }
-
-    void FillLayer::setFillPatternTransition(jni::JNIEnv&, jlong duration, jlong delay) {
-        mbgl::style::TransitionOptions options;
-        options.duration.emplace(mbgl::Milliseconds(duration));
-        options.delay.emplace(mbgl::Milliseconds(delay));
-        toFillLayer(layer).setFillPatternTransition(options);
-    }
-
-
-    // FillJavaLayerPeerFactory
-
-    FillJavaLayerPeerFactory::~FillJavaLayerPeerFactory() = default;
-
-    namespace {
-        jni::Local<jni::Object<Layer>> createJavaPeer(jni::JNIEnv& env, Layer* layer) {
-            static auto& javaClass = jni::Class<FillLayer>::Singleton(env);
-            static auto constructor = javaClass.GetConstructor<jni::jlong>(env);
-            return javaClass.New(env, constructor, reinterpret_cast<jni::jlong>(layer));
-        }
-    }  // namespace
-
-    jni::Local<jni::Object<Layer>> FillJavaLayerPeerFactory::createJavaLayerPeer(jni::JNIEnv& env,
-                                                                                 mbgl::style::Layer& layer) {
-        assert(layer.baseImpl->getTypeInfo() == getTypeInfo());
-        return createJavaPeer(env, new FillLayer(toFillLayer(layer)));
-    }
-
-    jni::Local<jni::Object<Layer>> FillJavaLayerPeerFactory::createJavaLayerPeer(
-        jni::JNIEnv& env, std::unique_ptr<mbgl::style::Layer> layer) {
-        assert(layer->baseImpl->getTypeInfo() == getTypeInfo());
-        return createJavaPeer(env,
-                              new FillLayer(std::unique_ptr<mbgl::style::FillLayer>(
-                                  static_cast<mbgl::style::FillLayer*>(layer.release()))));
-    }
-
-    void FillJavaLayerPeerFactory::registerNative(jni::JNIEnv& env) {
-        // Lookup the class
-        static auto& javaClass = jni::Class<FillLayer>::Singleton(env);
-
-        #define METHOD(MethodPtr, name) jni::MakeNativePeerMethod<decltype(MethodPtr), (MethodPtr)>(name)
-
-        // Register the peer
-        jni::RegisterNativePeer<FillLayer>(
-            env,
-            javaClass,
-            "nativePtr",
-            jni::MakePeer<FillLayer, jni::String&, jni::String&>,
-            "initialize",
-            "finalize",
-            METHOD(&FillLayer::getFillSortKey, "nativeGetFillSortKey"),
-            METHOD(&FillLayer::getFillAntialias, "nativeGetFillAntialias"),
-            METHOD(&FillLayer::getFillOpacityTransition, "nativeGetFillOpacityTransition"),
-            METHOD(&FillLayer::setFillOpacityTransition, "nativeSetFillOpacityTransition"),
-            METHOD(&FillLayer::getFillOpacity, "nativeGetFillOpacity"),
-            METHOD(&FillLayer::getFillColorTransition, "nativeGetFillColorTransition"),
-            METHOD(&FillLayer::setFillColorTransition, "nativeSetFillColorTransition"),
-            METHOD(&FillLayer::getFillColor, "nativeGetFillColor"),
-            METHOD(&FillLayer::getFillOutlineColorTransition, "nativeGetFillOutlineColorTransition"),
-            METHOD(&FillLayer::setFillOutlineColorTransition, "nativeSetFillOutlineColorTransition"),
-            METHOD(&FillLayer::getFillOutlineColor, "nativeGetFillOutlineColor"),
-            METHOD(&FillLayer::getFillTranslateTransition, "nativeGetFillTranslateTransition"),
-            METHOD(&FillLayer::setFillTranslateTransition, "nativeSetFillTranslateTransition"),
-            METHOD(&FillLayer::getFillTranslate, "nativeGetFillTranslate"),
-            METHOD(&FillLayer::getFillTranslateAnchor, "nativeGetFillTranslateAnchor"),
-            METHOD(&FillLayer::getFillPatternTransition, "nativeGetFillPatternTransition"),
-            METHOD(&FillLayer::setFillPatternTransition, "nativeSetFillPatternTransition"),
-            METHOD(&FillLayer::getFillPattern, "nativeGetFillPattern"));
-    }
-
-} // namespace android
-} // namespace mbgl
diff --git a/platform/android/src/style/layers/fill_layer.hpp b/platform/android/src/style/layers/fill_layer.hpp
deleted file mode 100644
index 807b939a71..0000000000
--- a/platform/android/src/style/layers/fill_layer.hpp
+++ /dev/null
@@ -1,72 +0,0 @@
-// This file is generated. Edit android/platform/scripts/generate-style-code.js, then run `make android-style-code`.
-
-#pragma once
-
-#include "layer.hpp"
-#include "../transition_options.hpp"
-#include <mbgl/layermanager/fill_layer_factory.hpp>
-#include <mbgl/style/layers/fill_layer.hpp>
-#include <jni/jni.hpp>
-
-namespace mbgl {
-namespace android {
-
-class FillLayer : public Layer {
-public:
-    using SuperTag = Layer;
-    static constexpr auto Name() { return "com/mapbox/mapboxsdk/style/layers/FillLayer"; };
-
-    FillLayer(jni::JNIEnv&, jni::String&, jni::String&);
-
-    FillLayer(mbgl::style::FillLayer&);
-
-    FillLayer(std::unique_ptr<mbgl::style::FillLayer>);
-
-    ~FillLayer();
-
-    // Properties
-
-    jni::Local<jni::Object<jni::ObjectTag>> getFillSortKey(jni::JNIEnv&);
-
-    jni::Local<jni::Object<jni::ObjectTag>> getFillAntialias(jni::JNIEnv&);
-
-    jni::Local<jni::Object<jni::ObjectTag>> getFillOpacity(jni::JNIEnv&);
-    void setFillOpacityTransition(jni::JNIEnv&, jlong duration, jlong delay);
-    jni::Local<jni::Object<TransitionOptions>> getFillOpacityTransition(jni::JNIEnv&);
-
-    jni::Local<jni::Object<jni::ObjectTag>> getFillColor(jni::JNIEnv&);
-    void setFillColorTransition(jni::JNIEnv&, jlong duration, jlong delay);
-    jni::Local<jni::Object<TransitionOptions>> getFillColorTransition(jni::JNIEnv&);
-
-    jni::Local<jni::Object<jni::ObjectTag>> getFillOutlineColor(jni::JNIEnv&);
-    void setFillOutlineColorTransition(jni::JNIEnv&, jlong duration, jlong delay);
-    jni::Local<jni::Object<TransitionOptions>> getFillOutlineColorTransition(jni::JNIEnv&);
-
-    jni::Local<jni::Object<jni::ObjectTag>> getFillTranslate(jni::JNIEnv&);
-    void setFillTranslateTransition(jni::JNIEnv&, jlong duration, jlong delay);
-    jni::Local<jni::Object<TransitionOptions>> getFillTranslateTransition(jni::JNIEnv&);
-
-    jni::Local<jni::Object<jni::ObjectTag>> getFillTranslateAnchor(jni::JNIEnv&);
-
-    jni::Local<jni::Object<jni::ObjectTag>> getFillPattern(jni::JNIEnv&);
-    void setFillPatternTransition(jni::JNIEnv&, jlong duration, jlong delay);
-    jni::Local<jni::Object<TransitionOptions>> getFillPatternTransition(jni::JNIEnv&);
-
-}; // class FillLayer
-
-class FillJavaLayerPeerFactory final : public JavaLayerPeerFactory,  public mbgl::FillLayerFactory {
-public:
-    ~FillJavaLayerPeerFactory() override;
-
-    // JavaLayerPeerFactory overrides.
-    jni::Local<jni::Object<Layer>> createJavaLayerPeer(jni::JNIEnv&, mbgl::style::Layer&) final;
-    jni::Local<jni::Object<Layer>> createJavaLayerPeer(jni::JNIEnv& env, std::unique_ptr<mbgl::style::Layer>) final;
-
-    void registerNative(jni::JNIEnv&) final;
-
-    LayerFactory* getLayerFactory() final { return this; }
-
-};  // class FillJavaLayerPeerFactory
-
-} // namespace android
-} // namespace mbgl
diff --git a/platform/android/src/style/layers/heatmap_layer.cpp b/platform/android/src/style/layers/heatmap_layer.cpp
deleted file mode 100644
index dad3d25e6c..0000000000
--- a/platform/android/src/style/layers/heatmap_layer.cpp
+++ /dev/null
@@ -1,163 +0,0 @@
-// This file is generated. Edit android/platform/scripts/generate-style-code.js, then run `make android-style-code`.
-
-#include "heatmap_layer.hpp"
-
-#include <string>
-
-#include "../conversion/property_value.hpp"
-#include "../conversion/transition_options.hpp"
-
-#include <mbgl/style/layer_impl.hpp>
-
-namespace mbgl {
-namespace android {
-
-    inline mbgl::style::HeatmapLayer& toHeatmapLayer(mbgl::style::Layer& layer) {
-        return static_cast<mbgl::style::HeatmapLayer&>(layer);
-    }
-
-    /**
-     * Creates an owning peer object (for layers not attached to the map) from the JVM side
-     */
-    HeatmapLayer::HeatmapLayer(jni::JNIEnv& env, jni::String& layerId, jni::String& sourceId)
-        : Layer(std::make_unique<mbgl::style::HeatmapLayer>(jni::Make<std::string>(env, layerId), jni::Make<std::string>(env, sourceId))) {
-    }
-
-    /**
-     * Creates a non-owning peer object (for layers currently attached to the map)
-     */
-    HeatmapLayer::HeatmapLayer(mbgl::style::HeatmapLayer& coreLayer) : Layer(coreLayer) {}
-
-    /**
-     * Creates an owning peer object (for layers not attached to the map)
-     */
-    HeatmapLayer::HeatmapLayer(std::unique_ptr<mbgl::style::HeatmapLayer> coreLayer) : Layer(std::move(coreLayer)) {}
-
-    HeatmapLayer::~HeatmapLayer() = default;
-
-    // Property getters
-
-    jni::Local<jni::Object<>> HeatmapLayer::getHeatmapRadius(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        return std::move(*convert<jni::Local<jni::Object<>>>(env, toHeatmapLayer(layer).getHeatmapRadius()));
-    }
-
-    jni::Local<jni::Object<TransitionOptions>> HeatmapLayer::getHeatmapRadiusTransition(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        mbgl::style::TransitionOptions options = toHeatmapLayer(layer).getHeatmapRadiusTransition();
-        return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, options));
-    }
-
-    void HeatmapLayer::setHeatmapRadiusTransition(jni::JNIEnv&, jlong duration, jlong delay) {
-        mbgl::style::TransitionOptions options;
-        options.duration.emplace(mbgl::Milliseconds(duration));
-        options.delay.emplace(mbgl::Milliseconds(delay));
-        toHeatmapLayer(layer).setHeatmapRadiusTransition(options);
-    }
-
-    jni::Local<jni::Object<>> HeatmapLayer::getHeatmapWeight(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        return std::move(*convert<jni::Local<jni::Object<>>>(env, toHeatmapLayer(layer).getHeatmapWeight()));
-    }
-
-    jni::Local<jni::Object<>> HeatmapLayer::getHeatmapIntensity(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        return std::move(*convert<jni::Local<jni::Object<>>>(env, toHeatmapLayer(layer).getHeatmapIntensity()));
-    }
-
-    jni::Local<jni::Object<TransitionOptions>> HeatmapLayer::getHeatmapIntensityTransition(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        mbgl::style::TransitionOptions options = toHeatmapLayer(layer).getHeatmapIntensityTransition();
-        return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, options));
-    }
-
-    void HeatmapLayer::setHeatmapIntensityTransition(jni::JNIEnv&, jlong duration, jlong delay) {
-        mbgl::style::TransitionOptions options;
-        options.duration.emplace(mbgl::Milliseconds(duration));
-        options.delay.emplace(mbgl::Milliseconds(delay));
-        toHeatmapLayer(layer).setHeatmapIntensityTransition(options);
-    }
-
-    jni::Local<jni::Object<>> HeatmapLayer::getHeatmapColor(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        auto propertyValue =  toHeatmapLayer(layer).getHeatmapColor();
-        if (propertyValue.isUndefined()) {
-            propertyValue =  toHeatmapLayer(layer).getDefaultHeatmapColor();
-        }
-        return std::move(*convert<jni::Local<jni::Object<>>>(env, propertyValue));
-    }
-
-    jni::Local<jni::Object<>> HeatmapLayer::getHeatmapOpacity(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        return std::move(*convert<jni::Local<jni::Object<>>>(env, toHeatmapLayer(layer).getHeatmapOpacity()));
-    }
-
-    jni::Local<jni::Object<TransitionOptions>> HeatmapLayer::getHeatmapOpacityTransition(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        mbgl::style::TransitionOptions options = toHeatmapLayer(layer).getHeatmapOpacityTransition();
-        return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, options));
-    }
-
-    void HeatmapLayer::setHeatmapOpacityTransition(jni::JNIEnv&, jlong duration, jlong delay) {
-        mbgl::style::TransitionOptions options;
-        options.duration.emplace(mbgl::Milliseconds(duration));
-        options.delay.emplace(mbgl::Milliseconds(delay));
-        toHeatmapLayer(layer).setHeatmapOpacityTransition(options);
-    }
-
-
-    // HeatmapJavaLayerPeerFactory
-
-    HeatmapJavaLayerPeerFactory::~HeatmapJavaLayerPeerFactory() = default;
-
-    namespace {
-        jni::Local<jni::Object<Layer>> createJavaPeer(jni::JNIEnv& env, Layer* layer) {
-            static auto& javaClass = jni::Class<HeatmapLayer>::Singleton(env);
-            static auto constructor = javaClass.GetConstructor<jni::jlong>(env);
-            return javaClass.New(env, constructor, reinterpret_cast<jni::jlong>(layer));
-        }
-    }  // namespace
-
-    jni::Local<jni::Object<Layer>> HeatmapJavaLayerPeerFactory::createJavaLayerPeer(jni::JNIEnv& env,
-                                                                                    mbgl::style::Layer& layer) {
-        assert(layer.baseImpl->getTypeInfo() == getTypeInfo());
-        return createJavaPeer(env, new HeatmapLayer(toHeatmapLayer(layer)));
-    }
-
-    jni::Local<jni::Object<Layer>> HeatmapJavaLayerPeerFactory::createJavaLayerPeer(
-        jni::JNIEnv& env, std::unique_ptr<mbgl::style::Layer> layer) {
-        assert(layer->baseImpl->getTypeInfo() == getTypeInfo());
-        return createJavaPeer(env,
-                              new HeatmapLayer(std::unique_ptr<mbgl::style::HeatmapLayer>(
-                                  static_cast<mbgl::style::HeatmapLayer*>(layer.release()))));
-    }
-
-    void HeatmapJavaLayerPeerFactory::registerNative(jni::JNIEnv& env) {
-        // Lookup the class
-        static auto& javaClass = jni::Class<HeatmapLayer>::Singleton(env);
-
-        #define METHOD(MethodPtr, name) jni::MakeNativePeerMethod<decltype(MethodPtr), (MethodPtr)>(name)
-
-        // Register the peer
-        jni::RegisterNativePeer<HeatmapLayer>(
-            env,
-            javaClass,
-            "nativePtr",
-            jni::MakePeer<HeatmapLayer, jni::String&, jni::String&>,
-            "initialize",
-            "finalize",
-            METHOD(&HeatmapLayer::getHeatmapRadiusTransition, "nativeGetHeatmapRadiusTransition"),
-            METHOD(&HeatmapLayer::setHeatmapRadiusTransition, "nativeSetHeatmapRadiusTransition"),
-            METHOD(&HeatmapLayer::getHeatmapRadius, "nativeGetHeatmapRadius"),
-            METHOD(&HeatmapLayer::getHeatmapWeight, "nativeGetHeatmapWeight"),
-            METHOD(&HeatmapLayer::getHeatmapIntensityTransition, "nativeGetHeatmapIntensityTransition"),
-            METHOD(&HeatmapLayer::setHeatmapIntensityTransition, "nativeSetHeatmapIntensityTransition"),
-            METHOD(&HeatmapLayer::getHeatmapIntensity, "nativeGetHeatmapIntensity"),
-            METHOD(&HeatmapLayer::getHeatmapColor, "nativeGetHeatmapColor"),
-            METHOD(&HeatmapLayer::getHeatmapOpacityTransition, "nativeGetHeatmapOpacityTransition"),
-            METHOD(&HeatmapLayer::setHeatmapOpacityTransition, "nativeSetHeatmapOpacityTransition"),
-            METHOD(&HeatmapLayer::getHeatmapOpacity, "nativeGetHeatmapOpacity"));
-    }
-
-} // namespace android
-} // namespace mbgl
diff --git a/platform/android/src/style/layers/heatmap_layer.hpp b/platform/android/src/style/layers/heatmap_layer.hpp
deleted file mode 100644
index f56e3eb4a9..0000000000
--- a/platform/android/src/style/layers/heatmap_layer.hpp
+++ /dev/null
@@ -1,62 +0,0 @@
-// This file is generated. Edit android/platform/scripts/generate-style-code.js, then run `make android-style-code`.
-
-#pragma once
-
-#include "layer.hpp"
-#include "../transition_options.hpp"
-#include <mbgl/layermanager/heatmap_layer_factory.hpp>
-#include <mbgl/style/layers/heatmap_layer.hpp>
-#include <jni/jni.hpp>
-
-namespace mbgl {
-namespace android {
-
-class HeatmapLayer : public Layer {
-public:
-    using SuperTag = Layer;
-    static constexpr auto Name() { return "com/mapbox/mapboxsdk/style/layers/HeatmapLayer"; };
-
-    HeatmapLayer(jni::JNIEnv&, jni::String&, jni::String&);
-
-    HeatmapLayer(mbgl::style::HeatmapLayer&);
-
-    HeatmapLayer(std::unique_ptr<mbgl::style::HeatmapLayer>);
-
-    ~HeatmapLayer();
-
-    // Properties
-
-    jni::Local<jni::Object<jni::ObjectTag>> getHeatmapRadius(jni::JNIEnv&);
-    void setHeatmapRadiusTransition(jni::JNIEnv&, jlong duration, jlong delay);
-    jni::Local<jni::Object<TransitionOptions>> getHeatmapRadiusTransition(jni::JNIEnv&);
-
-    jni::Local<jni::Object<jni::ObjectTag>> getHeatmapWeight(jni::JNIEnv&);
-
-    jni::Local<jni::Object<jni::ObjectTag>> getHeatmapIntensity(jni::JNIEnv&);
-    void setHeatmapIntensityTransition(jni::JNIEnv&, jlong duration, jlong delay);
-    jni::Local<jni::Object<TransitionOptions>> getHeatmapIntensityTransition(jni::JNIEnv&);
-
-    jni::Local<jni::Object<jni::ObjectTag>> getHeatmapColor(jni::JNIEnv&);
-
-    jni::Local<jni::Object<jni::ObjectTag>> getHeatmapOpacity(jni::JNIEnv&);
-    void setHeatmapOpacityTransition(jni::JNIEnv&, jlong duration, jlong delay);
-    jni::Local<jni::Object<TransitionOptions>> getHeatmapOpacityTransition(jni::JNIEnv&);
-
-}; // class HeatmapLayer
-
-class HeatmapJavaLayerPeerFactory final : public JavaLayerPeerFactory,  public mbgl::HeatmapLayerFactory {
-public:
-    ~HeatmapJavaLayerPeerFactory() override;
-
-    // JavaLayerPeerFactory overrides.
-    jni::Local<jni::Object<Layer>> createJavaLayerPeer(jni::JNIEnv&, mbgl::style::Layer&) final;
-    jni::Local<jni::Object<Layer>> createJavaLayerPeer(jni::JNIEnv& env, std::unique_ptr<mbgl::style::Layer>) final;
-
-    void registerNative(jni::JNIEnv&) final;
-
-    LayerFactory* getLayerFactory() final { return this; }
-
-};  // class HeatmapJavaLayerPeerFactory
-
-} // namespace android
-} // namespace mbgl
diff --git a/platform/android/src/style/layers/hillshade_layer.cpp b/platform/android/src/style/layers/hillshade_layer.cpp
deleted file mode 100644
index 1f5fe1912f..0000000000
--- a/platform/android/src/style/layers/hillshade_layer.cpp
+++ /dev/null
@@ -1,181 +0,0 @@
-// This file is generated. Edit android/platform/scripts/generate-style-code.js, then run `make android-style-code`.
-
-#include "hillshade_layer.hpp"
-
-#include <string>
-
-#include "../conversion/property_value.hpp"
-#include "../conversion/transition_options.hpp"
-
-#include <mbgl/style/layer_impl.hpp>
-
-namespace mbgl {
-namespace android {
-
-    inline mbgl::style::HillshadeLayer& toHillshadeLayer(mbgl::style::Layer& layer) {
-        return static_cast<mbgl::style::HillshadeLayer&>(layer);
-    }
-
-    /**
-     * Creates an owning peer object (for layers not attached to the map) from the JVM side
-     */
-    HillshadeLayer::HillshadeLayer(jni::JNIEnv& env, jni::String& layerId, jni::String& sourceId)
-        : Layer(std::make_unique<mbgl::style::HillshadeLayer>(jni::Make<std::string>(env, layerId), jni::Make<std::string>(env, sourceId))) {
-    }
-
-    /**
-     * Creates a non-owning peer object (for layers currently attached to the map)
-     */
-    HillshadeLayer::HillshadeLayer(mbgl::style::HillshadeLayer& coreLayer) : Layer(coreLayer) {}
-
-    /**
-     * Creates an owning peer object (for layers not attached to the map)
-     */
-    HillshadeLayer::HillshadeLayer(std::unique_ptr<mbgl::style::HillshadeLayer> coreLayer)
-        : Layer(std::move(coreLayer)) {}
-
-    HillshadeLayer::~HillshadeLayer() = default;
-
-    // Property getters
-
-    jni::Local<jni::Object<>> HillshadeLayer::getHillshadeIlluminationDirection(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        return std::move(*convert<jni::Local<jni::Object<>>>(env, toHillshadeLayer(layer).getHillshadeIlluminationDirection()));
-    }
-
-    jni::Local<jni::Object<>> HillshadeLayer::getHillshadeIlluminationAnchor(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        return std::move(*convert<jni::Local<jni::Object<>>>(env, toHillshadeLayer(layer).getHillshadeIlluminationAnchor()));
-    }
-
-    jni::Local<jni::Object<>> HillshadeLayer::getHillshadeExaggeration(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        return std::move(*convert<jni::Local<jni::Object<>>>(env, toHillshadeLayer(layer).getHillshadeExaggeration()));
-    }
-
-    jni::Local<jni::Object<TransitionOptions>> HillshadeLayer::getHillshadeExaggerationTransition(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        mbgl::style::TransitionOptions options = toHillshadeLayer(layer).getHillshadeExaggerationTransition();
-        return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, options));
-    }
-
-    void HillshadeLayer::setHillshadeExaggerationTransition(jni::JNIEnv&, jlong duration, jlong delay) {
-        mbgl::style::TransitionOptions options;
-        options.duration.emplace(mbgl::Milliseconds(duration));
-        options.delay.emplace(mbgl::Milliseconds(delay));
-        toHillshadeLayer(layer).setHillshadeExaggerationTransition(options);
-    }
-
-    jni::Local<jni::Object<>> HillshadeLayer::getHillshadeShadowColor(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        return std::move(*convert<jni::Local<jni::Object<>>>(env, toHillshadeLayer(layer).getHillshadeShadowColor()));
-    }
-
-    jni::Local<jni::Object<TransitionOptions>> HillshadeLayer::getHillshadeShadowColorTransition(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        mbgl::style::TransitionOptions options = toHillshadeLayer(layer).getHillshadeShadowColorTransition();
-        return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, options));
-    }
-
-    void HillshadeLayer::setHillshadeShadowColorTransition(jni::JNIEnv&, jlong duration, jlong delay) {
-        mbgl::style::TransitionOptions options;
-        options.duration.emplace(mbgl::Milliseconds(duration));
-        options.delay.emplace(mbgl::Milliseconds(delay));
-        toHillshadeLayer(layer).setHillshadeShadowColorTransition(options);
-    }
-
-    jni::Local<jni::Object<>> HillshadeLayer::getHillshadeHighlightColor(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        return std::move(*convert<jni::Local<jni::Object<>>>(env, toHillshadeLayer(layer).getHillshadeHighlightColor()));
-    }
-
-    jni::Local<jni::Object<TransitionOptions>> HillshadeLayer::getHillshadeHighlightColorTransition(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        mbgl::style::TransitionOptions options = toHillshadeLayer(layer).getHillshadeHighlightColorTransition();
-        return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, options));
-    }
-
-    void HillshadeLayer::setHillshadeHighlightColorTransition(jni::JNIEnv&, jlong duration, jlong delay) {
-        mbgl::style::TransitionOptions options;
-        options.duration.emplace(mbgl::Milliseconds(duration));
-        options.delay.emplace(mbgl::Milliseconds(delay));
-        toHillshadeLayer(layer).setHillshadeHighlightColorTransition(options);
-    }
-
-    jni::Local<jni::Object<>> HillshadeLayer::getHillshadeAccentColor(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        return std::move(*convert<jni::Local<jni::Object<>>>(env, toHillshadeLayer(layer).getHillshadeAccentColor()));
-    }
-
-    jni::Local<jni::Object<TransitionOptions>> HillshadeLayer::getHillshadeAccentColorTransition(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        mbgl::style::TransitionOptions options = toHillshadeLayer(layer).getHillshadeAccentColorTransition();
-        return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, options));
-    }
-
-    void HillshadeLayer::setHillshadeAccentColorTransition(jni::JNIEnv&, jlong duration, jlong delay) {
-        mbgl::style::TransitionOptions options;
-        options.duration.emplace(mbgl::Milliseconds(duration));
-        options.delay.emplace(mbgl::Milliseconds(delay));
-        toHillshadeLayer(layer).setHillshadeAccentColorTransition(options);
-    }
-
-
-    // HillshadeJavaLayerPeerFactory
-
-    HillshadeJavaLayerPeerFactory::~HillshadeJavaLayerPeerFactory() = default;
-
-    namespace {
-        jni::Local<jni::Object<Layer>> createJavaPeer(jni::JNIEnv& env, Layer* layer) {
-            static auto& javaClass = jni::Class<HillshadeLayer>::Singleton(env);
-            static auto constructor = javaClass.GetConstructor<jni::jlong>(env);
-            return javaClass.New(env, constructor, reinterpret_cast<jni::jlong>(layer));
-        }
-    }  // namespace
-
-    jni::Local<jni::Object<Layer>> HillshadeJavaLayerPeerFactory::createJavaLayerPeer(jni::JNIEnv& env,
-                                                                                      mbgl::style::Layer& layer) {
-        assert(layer.baseImpl->getTypeInfo() == getTypeInfo());
-        return createJavaPeer(env, new HillshadeLayer(toHillshadeLayer(layer)));
-    }
-
-    jni::Local<jni::Object<Layer>> HillshadeJavaLayerPeerFactory::createJavaLayerPeer(
-        jni::JNIEnv& env, std::unique_ptr<mbgl::style::Layer> layer) {
-        assert(layer->baseImpl->getTypeInfo() == getTypeInfo());
-        return createJavaPeer(env,
-                              new HillshadeLayer(std::unique_ptr<mbgl::style::HillshadeLayer>(
-                                  static_cast<mbgl::style::HillshadeLayer*>(layer.release()))));
-    }
-
-    void HillshadeJavaLayerPeerFactory::registerNative(jni::JNIEnv& env) {
-        // Lookup the class
-        static auto& javaClass = jni::Class<HillshadeLayer>::Singleton(env);
-
-        #define METHOD(MethodPtr, name) jni::MakeNativePeerMethod<decltype(MethodPtr), (MethodPtr)>(name)
-
-        // Register the peer
-        jni::RegisterNativePeer<HillshadeLayer>(
-            env,
-            javaClass,
-            "nativePtr",
-            jni::MakePeer<HillshadeLayer, jni::String&, jni::String&>,
-            "initialize",
-            "finalize",
-            METHOD(&HillshadeLayer::getHillshadeIlluminationDirection, "nativeGetHillshadeIlluminationDirection"),
-            METHOD(&HillshadeLayer::getHillshadeIlluminationAnchor, "nativeGetHillshadeIlluminationAnchor"),
-            METHOD(&HillshadeLayer::getHillshadeExaggerationTransition, "nativeGetHillshadeExaggerationTransition"),
-            METHOD(&HillshadeLayer::setHillshadeExaggerationTransition, "nativeSetHillshadeExaggerationTransition"),
-            METHOD(&HillshadeLayer::getHillshadeExaggeration, "nativeGetHillshadeExaggeration"),
-            METHOD(&HillshadeLayer::getHillshadeShadowColorTransition, "nativeGetHillshadeShadowColorTransition"),
-            METHOD(&HillshadeLayer::setHillshadeShadowColorTransition, "nativeSetHillshadeShadowColorTransition"),
-            METHOD(&HillshadeLayer::getHillshadeShadowColor, "nativeGetHillshadeShadowColor"),
-            METHOD(&HillshadeLayer::getHillshadeHighlightColorTransition, "nativeGetHillshadeHighlightColorTransition"),
-            METHOD(&HillshadeLayer::setHillshadeHighlightColorTransition, "nativeSetHillshadeHighlightColorTransition"),
-            METHOD(&HillshadeLayer::getHillshadeHighlightColor, "nativeGetHillshadeHighlightColor"),
-            METHOD(&HillshadeLayer::getHillshadeAccentColorTransition, "nativeGetHillshadeAccentColorTransition"),
-            METHOD(&HillshadeLayer::setHillshadeAccentColorTransition, "nativeSetHillshadeAccentColorTransition"),
-            METHOD(&HillshadeLayer::getHillshadeAccentColor, "nativeGetHillshadeAccentColor"));
-    }
-
-} // namespace android
-} // namespace mbgl
diff --git a/platform/android/src/style/layers/hillshade_layer.hpp b/platform/android/src/style/layers/hillshade_layer.hpp
deleted file mode 100644
index bc210a9987..0000000000
--- a/platform/android/src/style/layers/hillshade_layer.hpp
+++ /dev/null
@@ -1,66 +0,0 @@
-// This file is generated. Edit android/platform/scripts/generate-style-code.js, then run `make android-style-code`.
-
-#pragma once
-
-#include "layer.hpp"
-#include "../transition_options.hpp"
-#include <mbgl/layermanager/hillshade_layer_factory.hpp>
-#include <mbgl/style/layers/hillshade_layer.hpp>
-#include <jni/jni.hpp>
-
-namespace mbgl {
-namespace android {
-
-class HillshadeLayer : public Layer {
-public:
-    using SuperTag = Layer;
-    static constexpr auto Name() { return "com/mapbox/mapboxsdk/style/layers/HillshadeLayer"; };
-
-    HillshadeLayer(jni::JNIEnv&, jni::String&, jni::String&);
-
-    HillshadeLayer(mbgl::style::HillshadeLayer&);
-
-    HillshadeLayer(std::unique_ptr<mbgl::style::HillshadeLayer>);
-
-    ~HillshadeLayer();
-
-    // Properties
-
-    jni::Local<jni::Object<jni::ObjectTag>> getHillshadeIlluminationDirection(jni::JNIEnv&);
-
-    jni::Local<jni::Object<jni::ObjectTag>> getHillshadeIlluminationAnchor(jni::JNIEnv&);
-
-    jni::Local<jni::Object<jni::ObjectTag>> getHillshadeExaggeration(jni::JNIEnv&);
-    void setHillshadeExaggerationTransition(jni::JNIEnv&, jlong duration, jlong delay);
-    jni::Local<jni::Object<TransitionOptions>> getHillshadeExaggerationTransition(jni::JNIEnv&);
-
-    jni::Local<jni::Object<jni::ObjectTag>> getHillshadeShadowColor(jni::JNIEnv&);
-    void setHillshadeShadowColorTransition(jni::JNIEnv&, jlong duration, jlong delay);
-    jni::Local<jni::Object<TransitionOptions>> getHillshadeShadowColorTransition(jni::JNIEnv&);
-
-    jni::Local<jni::Object<jni::ObjectTag>> getHillshadeHighlightColor(jni::JNIEnv&);
-    void setHillshadeHighlightColorTransition(jni::JNIEnv&, jlong duration, jlong delay);
-    jni::Local<jni::Object<TransitionOptions>> getHillshadeHighlightColorTransition(jni::JNIEnv&);
-
-    jni::Local<jni::Object<jni::ObjectTag>> getHillshadeAccentColor(jni::JNIEnv&);
-    void setHillshadeAccentColorTransition(jni::JNIEnv&, jlong duration, jlong delay);
-    jni::Local<jni::Object<TransitionOptions>> getHillshadeAccentColorTransition(jni::JNIEnv&);
-
-}; // class HillshadeLayer
-
-class HillshadeJavaLayerPeerFactory final : public JavaLayerPeerFactory,  public mbgl::HillshadeLayerFactory {
-public:
-    ~HillshadeJavaLayerPeerFactory() override;
-
-    // JavaLayerPeerFactory overrides.
-    jni::Local<jni::Object<Layer>> createJavaLayerPeer(jni::JNIEnv&, mbgl::style::Layer&) final;
-    jni::Local<jni::Object<Layer>> createJavaLayerPeer(jni::JNIEnv& env, std::unique_ptr<mbgl::style::Layer>) final;
-
-    void registerNative(jni::JNIEnv&) final;
-
-    LayerFactory* getLayerFactory() final { return this; }
-
-};  // class HillshadeJavaLayerPeerFactory
-
-} // namespace android
-} // namespace mbgl
diff --git a/platform/android/src/style/layers/layer.cpp b/platform/android/src/style/layers/layer.cpp
deleted file mode 100644
index bc87a9d9ba..0000000000
--- a/platform/android/src/style/layers/layer.cpp
+++ /dev/null
@@ -1,178 +0,0 @@
-#include "layer.hpp"
-#include "../android_conversion.hpp"
-
-#include <jni/jni.hpp>
-
-#include <mbgl/style/style.hpp>
-#include <mbgl/style/filter.hpp>
-#include <mbgl/style/transition_options.hpp>
-#include <mbgl/style/layers/background_layer.hpp>
-#include <mbgl/style/layers/circle_layer.hpp>
-#include <mbgl/style/layers/fill_layer.hpp>
-#include <mbgl/style/layers/fill_extrusion_layer.hpp>
-#include <mbgl/style/layers/heatmap_layer.hpp>
-#include <mbgl/style/layers/hillshade_layer.hpp>
-#include <mbgl/style/layers/line_layer.hpp>
-#include <mbgl/style/layers/raster_layer.hpp>
-#include <mbgl/style/layers/symbol_layer.hpp>
-#include <mbgl/util/logging.hpp>
-
-// Java -> C++ conversion
-#include <mbgl/style/conversion/filter.hpp>
-#include <mbgl/style/conversion/layer.hpp>
-#include <mbgl/style/conversion/source.hpp>
-#include <mbgl/style/conversion_impl.hpp>
-
-// C++ -> Java conversion
-#include "../conversion/property_value.hpp"
-#include "custom_layer.hpp"
-#include "background_layer.hpp"
-#include <mbgl/style/filter.hpp>
-
-#include <string>
-
-namespace mbgl {
-namespace android {
-
-    /**
-     * Invoked when the construction is initiated from the jvm through a subclass
-     */
-    Layer::Layer(std::unique_ptr<mbgl::style::Layer> coreLayer)
-        : ownedLayer(std::move(coreLayer))
-        , layer(*ownedLayer) {
-    }
-
-    /**
-     * Takes a non-owning reference. For lookup methods
-     */
-    Layer::Layer(mbgl::style::Layer& coreLayer) : layer(coreLayer) {}
-
-    Layer::~Layer() {
-    }
-
-    void Layer::addToStyle(mbgl::style::Style& style, mbgl::optional<std::string> before) {
-        // Check to see if we own the layer first
-        if (!ownedLayer) {
-            throw std::runtime_error("Cannot add layer twice");
-        }
-
-        // Add layer to map
-        style.addLayer(releaseCoreLayer(), before);
-    }
-
-    void Layer::setLayer(std::unique_ptr<mbgl::style::Layer> sourceLayer) {
-        this->ownedLayer = std::move(sourceLayer);
-    }
-
-    std::unique_ptr<mbgl::style::Layer> Layer::releaseCoreLayer() {
-        assert(ownedLayer != nullptr);
-        return std::move(ownedLayer);
-    }
-
-    jni::Local<jni::String> Layer::getId(jni::JNIEnv& env) {
-        return jni::Make<jni::String>(env, layer.getID());
-    }
-
-    style::Layer& Layer::get() {
-        return layer;
-    }
-
-    void Layer::setProperty(jni::JNIEnv& env, const jni::String& jname, const jni::Object<>& jvalue) {
-        // Convert and set property
-        optional<mbgl::style::conversion::Error> error =
-            layer.setProperty(jni::Make<std::string>(env, jname), Value(env, jvalue));
-        if (error) {
-            mbgl::Log::Error(mbgl::Event::JNI, "Error setting property: " + jni::Make<std::string>(env, jname) + " " + error->message);
-            return;
-        }
-    }
-
-    void Layer::setFilter(jni::JNIEnv& env, const jni::Array<jni::Object<>>& jfilter) {
-        using namespace mbgl::style;
-        using namespace mbgl::style::conversion;
-
-        Error error;
-        optional<Filter> converted = convert<Filter>(Value(env, jfilter), error);
-        if (!converted) {
-            mbgl::Log::Error(mbgl::Event::JNI, "Error setting filter: " + error.message);
-            return;
-        }
-
-        layer.setFilter(std::move(*converted));
-    }
-
-    jni::Local<jni::Object<gson::JsonElement>> Layer::getFilter(jni::JNIEnv& env) {
-        using namespace mbgl::style;
-        using namespace mbgl::style::conversion;
-
-        Filter filter = layer.getFilter();
-        if (filter.expression) {
-            mbgl::Value expressionValue = (*filter.expression)->serialize();
-            return gson::JsonElement::New(env, expressionValue);
-        } else {
-            return jni::Local<jni::Object<gson::JsonElement>>(env, nullptr);
-        }
-    }
-
-    void Layer::setSourceLayer(jni::JNIEnv& env, const jni::String& sourceLayer) {
-        layer.setSourceLayer(jni::Make<std::string>(env, sourceLayer));
-    }
-
-    jni::Local<jni::String> Layer::getSourceLayer(jni::JNIEnv& env) {
-        return jni::Make<jni::String>(env, layer.getSourceLayer());
-    }
-
-    jni::Local<jni::String> Layer::getSourceId(jni::JNIEnv& env) {
-        return jni::Make<jni::String>(env, layer.getSourceID());
-    }
-
-    jni::jfloat Layer::getMinZoom(jni::JNIEnv&){
-        return layer.getMinZoom();
-    }
-
-    jni::jfloat Layer::getMaxZoom(jni::JNIEnv&) {
-        return layer.getMaxZoom();
-    }
-
-    void Layer::setMinZoom(jni::JNIEnv&, jni::jfloat zoom) {
-        layer.setMinZoom(zoom);
-    }
-
-    void Layer::setMaxZoom(jni::JNIEnv&, jni::jfloat zoom) {
-        layer.setMaxZoom(zoom);
-    }
-
-    jni::Local<jni::Object<>> Layer::getVisibility(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        return std::move(*convert<jni::Local<jni::Object<>>>(env, layer.getVisibility()));
-    }
-
-    void Layer::registerNative(jni::JNIEnv& env) {
-        // Lookup the class
-        static auto& javaClass = jni::Class<Layer>::Singleton(env);
-
-        #define METHOD(MethodPtr, name) jni::MakeNativePeerMethod<decltype(MethodPtr), (MethodPtr)>(name)
-
-        // Register the peer
-        jni::RegisterNativePeer<Layer>(
-            env,
-            javaClass,
-            "nativePtr",
-            METHOD(&Layer::getId, "nativeGetId"),
-            METHOD(&Layer::setProperty,
-                   "nativeSetLayoutProperty"), // TODO : Export only nativeSetProperty() when #15970 lands.
-            METHOD(&Layer::setProperty, "nativeSetPaintProperty"),
-            METHOD(&Layer::setFilter, "nativeSetFilter"),
-            METHOD(&Layer::getFilter, "nativeGetFilter"),
-            METHOD(&Layer::setSourceLayer, "nativeSetSourceLayer"),
-            METHOD(&Layer::getSourceLayer, "nativeGetSourceLayer"),
-            METHOD(&Layer::getSourceId, "nativeGetSourceId"),
-            METHOD(&Layer::getMinZoom, "nativeGetMinZoom"),
-            METHOD(&Layer::getMaxZoom, "nativeGetMaxZoom"),
-            METHOD(&Layer::setMinZoom, "nativeSetMinZoom"),
-            METHOD(&Layer::setMaxZoom, "nativeSetMaxZoom"),
-            METHOD(&Layer::getVisibility, "nativeGetVisibility"));
-    }
-
-} // namespace android
-} // namespace mbgl
diff --git a/platform/android/src/style/layers/layer.cpp.ejs b/platform/android/src/style/layers/layer.cpp.ejs
deleted file mode 100644
index 5d241e9a3b..0000000000
--- a/platform/android/src/style/layers/layer.cpp.ejs
+++ /dev/null
@@ -1,139 +0,0 @@
-<%
-  const type = locals.type;
-  const properties = locals.properties;
--%>
-// This file is generated. Edit android/platform/scripts/generate-style-code.js, then run `make android-style-code`.
-
-#include "<%- type.replace('-', '_') %>_layer.hpp"
-
-#include <string>
-
-#include "../conversion/property_value.hpp"
-#include "../conversion/transition_options.hpp"
-
-#include <mbgl/style/layer_impl.hpp>
-
-namespace mbgl {
-namespace android {
-
-    inline mbgl::style::<%- camelize(type) %>Layer& to<%- camelize(type) %>Layer(mbgl::style::Layer& layer) {
-        return static_cast<mbgl::style::<%- camelize(type) %>Layer&>(layer);
-    }
-
-<% if (type === 'background') { -%>
-    /**
-     * Creates an owning peer object (for layers not attached to the map) from the JVM side
-     */
-    <%- camelize(type) %>Layer::<%- camelize(type) %>Layer(jni::JNIEnv& env, jni::String& layerId)
-        : Layer(std::make_unique<mbgl::style::<%- camelize(type) %>Layer>(jni::Make<std::string>(env, layerId))) {
-<% } else { -%>
-    /**
-     * Creates an owning peer object (for layers not attached to the map) from the JVM side
-     */
-    <%- camelize(type) %>Layer::<%- camelize(type) %>Layer(jni::JNIEnv& env, jni::String& layerId, jni::String& sourceId)
-        : Layer(std::make_unique<mbgl::style::<%- camelize(type) %>Layer>(jni::Make<std::string>(env, layerId), jni::Make<std::string>(env, sourceId))) {
-<% } -%>
-    }
-
-    /**
-     * Creates a non-owning peer object (for layers currently attached to the map)
-     */
-    <%- camelize(type) %>Layer::<%- camelize(type) %>Layer(mbgl::style::<%- camelize(type) %>Layer& coreLayer)
-        : Layer(coreLayer) {
-    }
-
-    /**
-     * Creates an owning peer object (for layers not attached to the map)
-     */
-    <%- camelize(type) %>Layer::<%- camelize(type) %>Layer(std::unique_ptr<mbgl::style::<%- camelize(type) %>Layer> coreLayer)
-        : Layer(std::move(coreLayer)) {
-    }
-
-    <%- camelize(type) %>Layer::~<%- camelize(type) %>Layer() = default;
-
-    // Property getters
-
-<% for (const property of properties) { -%>
-<% if (property.name != 'heatmap-color') { -%>
-    jni::Local<jni::Object<>> <%- camelize(type) %>Layer::get<%- camelize(property.name) %>(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        return std::move(*convert<jni::Local<jni::Object<>>>(env, to<%- camelize(type) %>Layer(layer).get<%- camelize(property.name) %>()));
-    }
-
-<% } else { -%>
-    jni::Local<jni::Object<>> HeatmapLayer::getHeatmapColor(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        auto propertyValue =  to<%- camelize(type) %>Layer(layer).getHeatmapColor();
-        if (propertyValue.isUndefined()) {
-            propertyValue =  to<%- camelize(type) %>Layer(layer).getDefaultHeatmapColor();
-        }
-        return std::move(*convert<jni::Local<jni::Object<>>>(env, propertyValue));
-    }
-
-<% } -%>
-<% if (property.transition) { -%>
-    jni::Local<jni::Object<TransitionOptions>> <%- camelize(type) %>Layer::get<%- camelize(property.name) %>Transition(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        mbgl::style::TransitionOptions options = to<%- camelize(type) %>Layer(layer).get<%- camelize(property.name) %>Transition();
-        return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, options));
-    }
-
-    void <%- camelize(type) %>Layer::set<%- camelize(property.name) %>Transition(jni::JNIEnv&, jlong duration, jlong delay) {
-        mbgl::style::TransitionOptions options;
-        options.duration.emplace(mbgl::Milliseconds(duration));
-        options.delay.emplace(mbgl::Milliseconds(delay));
-        to<%- camelize(type) %>Layer(layer).set<%- camelize(property.name) %>Transition(options);
-    }
-
-<% } -%>
-<% } -%>
-
-    // <%- camelize(type) %>JavaLayerPeerFactory
-
-    <%- camelize(type) %>JavaLayerPeerFactory::~<%- camelize(type) %>JavaLayerPeerFactory() = default;
-
-    namespace {
-        jni::Local<jni::Object<Layer>> createJavaPeer(jni::JNIEnv& env, Layer* layer) {
-            static auto& javaClass = jni::Class<<%- camelize(type) %>Layer>::Singleton(env);
-            static auto constructor = javaClass.GetConstructor<jni::jlong>(env);
-            return javaClass.New(env, constructor, reinterpret_cast<jni::jlong>(layer));
-        }
-    }  // namespace
-
-    jni::Local<jni::Object<Layer>> <%- camelize(type) %>JavaLayerPeerFactory::createJavaLayerPeer(jni::JNIEnv& env, mbgl::style::Layer& layer) {
-        assert(layer.baseImpl->getTypeInfo() == getTypeInfo());
-        return createJavaPeer(env, new <%- camelize(type) %>Layer(to<%- camelize(type) %>Layer(layer)));
-    }
-
-    jni::Local<jni::Object<Layer>> <%- camelize(type) %>JavaLayerPeerFactory::createJavaLayerPeer(jni::JNIEnv& env, std::unique_ptr<mbgl::style::Layer> layer) {
-        assert(layer->baseImpl->getTypeInfo() == getTypeInfo());
-        return createJavaPeer(env, new <%- camelize(type) %>Layer(std::unique_ptr<mbgl::style::<%- camelize(type) %>Layer>(static_cast<mbgl::style::<%- camelize(type) %>Layer*>(layer.release()))));
-    }
-
-    void <%- camelize(type) %>JavaLayerPeerFactory::registerNative(jni::JNIEnv& env) {
-        // Lookup the class
-        static auto& javaClass = jni::Class<<%- camelize(type) %>Layer>::Singleton(env);
-
-        #define METHOD(MethodPtr, name) jni::MakeNativePeerMethod<decltype(MethodPtr), (MethodPtr)>(name)
-
-        // Register the peer
-        jni::RegisterNativePeer<<%- camelize(type) %>Layer>(
-            env,
-            javaClass,
-            "nativePtr",
-<% if (type === 'background') { -%>
-            jni::MakePeer<<%- camelize(type) %>Layer, jni::String&>,
-<% } else { -%>
-            jni::MakePeer<<%- camelize(type) %>Layer, jni::String&, jni::String&>,
-<% } -%>
-            "initialize",
-            "finalize",<% for(var i = 0; i < properties.length; i++) {%>
-<% if (properties[i].transition) { -%>
-            METHOD(&<%- camelize(type) %>Layer::get<%- camelize(properties[i].name) %>Transition, "nativeGet<%- camelize(properties[i].name) %>Transition"),
-            METHOD(&<%- camelize(type) %>Layer::set<%- camelize(properties[i].name) %>Transition, "nativeSet<%- camelize(properties[i].name) %>Transition"),
-<% } -%>
-            METHOD(&<%- camelize(type) %>Layer::get<%- camelize(properties[i].name) %>, "nativeGet<%- camelize(properties[i].name) %>")<% if(i != (properties.length -1)) {-%>,<% } -%><% } -%>);
-    }
-
-} // namespace android
-} // namespace mbgl
diff --git a/platform/android/src/style/layers/layer.hpp b/platform/android/src/style/layers/layer.hpp
deleted file mode 100644
index 557990844c..0000000000
--- a/platform/android/src/style/layers/layer.hpp
+++ /dev/null
@@ -1,117 +0,0 @@
-#pragma once
-
-#include <mbgl/layermanager/layer_factory.hpp>
-#include <mbgl/style/layer.hpp>
-#include <mbgl/style/style.hpp>
-#include "../../gson/json_array.hpp"
-#include "../../gson/json_element.hpp"
-#include "../value.hpp"
-
-#include <jni/jni.hpp>
-
-namespace mbgl {
-
-namespace android {
-
-class Layer {
-public:
-
-    static constexpr auto Name() { return "com/mapbox/mapboxsdk/style/layers/Layer"; };
-
-    static void registerNative(jni::JNIEnv&);
-
-    virtual ~Layer();
-
-    /**
-     * Set core layer (ie return ownership after remove)
-     */
-    void setLayer(std::unique_ptr<mbgl::style::Layer>);
-
-    void addToStyle(mbgl::style::Style&, mbgl::optional<std::string>);
-
-    // Release the owned view and return it
-    std::unique_ptr<mbgl::style::Layer> releaseCoreLayer();
-
-    jni::Local<jni::String> getId(jni::JNIEnv&);
-
-    jni::Local<jni::String> getSourceId(jni::JNIEnv&);
-
-    style::Layer& get();
-
-    void setProperty(jni::JNIEnv&, const jni::String&, const jni::Object<>& value);
-
-    // Zoom
-
-    jni::jfloat getMinZoom(jni::JNIEnv&);
-
-    jni::jfloat getMaxZoom(jni::JNIEnv&);
-
-    void setMinZoom(jni::JNIEnv&, jni::jfloat zoom);
-
-    void setMaxZoom(jni::JNIEnv&, jni::jfloat zoom);
-
-    /* common properties, but not shared by all */
-
-    void setFilter(jni::JNIEnv&, const jni::Array<jni::Object<>>&);
-
-    jni::Local<jni::Object<gson::JsonElement>> getFilter(jni::JNIEnv&);
-
-    void setSourceLayer(jni::JNIEnv&, const jni::String&);
-
-    jni::Local<jni::String> getSourceLayer(jni::JNIEnv&);
-
-    // Property getters
-
-    jni::Local<jni::Object<jni::ObjectTag>> getVisibility(jni::JNIEnv&);
-
-protected:
-    /*
-     * Called when a non-owning peer object is created on the c++ side
-     */
-    Layer(mbgl::style::Layer&);
-
-    /*
-     * Called when a owning peer object is created on the c++ side
-     */
-    Layer(std::unique_ptr<mbgl::style::Layer>);
-
-    // Owned layer is set when creating a new layer, before adding it to the map
-    std::unique_ptr<mbgl::style::Layer> ownedLayer;
-
-    // Raw reference to the layer
-    mbgl::style::Layer& layer;
-};
-
-/**
- * @brief A factory class for a layer Java peer objects of a certain type.
- */
-class JavaLayerPeerFactory {
-public:
-    virtual ~JavaLayerPeerFactory() = default;
-    /**
-     * @brief Create a non-owning peer.
-     */
-    virtual jni::Local<jni::Object<Layer>> createJavaLayerPeer(jni::JNIEnv&, mbgl::style::Layer&) = 0;
-
-    /**
-     * @brief Create an owning peer.
-     */
-    virtual jni::Local<jni::Object<Layer>> createJavaLayerPeer(jni::JNIEnv& env,
-                                                               std::unique_ptr<mbgl::style::Layer>) = 0;
-
-    /**
-     * @brief Register peer methods.
-     */
-    virtual void registerNative(jni::JNIEnv&) = 0;
-
-    /**
-     * @brief Get the corresponding layer factory.
-     * 
-     * @return style::LayerFactory* must not be \c nullptr.
-     */
-    virtual LayerFactory* getLayerFactory() = 0;
-};
-
-
-} // namespace android
-} // namespace mbgl
diff --git a/platform/android/src/style/layers/layer.hpp.ejs b/platform/android/src/style/layers/layer.hpp.ejs
deleted file mode 100644
index eb8db0620d..0000000000
--- a/platform/android/src/style/layers/layer.hpp.ejs
+++ /dev/null
@@ -1,62 +0,0 @@
-<%
-  const type = locals.type;
-  const properties = locals.properties;
--%>
-// This file is generated. Edit android/platform/scripts/generate-style-code.js, then run `make android-style-code`.
-
-#pragma once
-
-#include "layer.hpp"
-#include "../transition_options.hpp"
-#include <mbgl/layermanager/<%- type.replace('-', '_') %>_layer_factory.hpp>
-#include <mbgl/style/layers/<%- type.replace('-', '_') %>_layer.hpp>
-#include <jni/jni.hpp>
-
-namespace mbgl {
-namespace android {
-
-class <%- camelize(type) %>Layer : public Layer {
-public:
-    using SuperTag = Layer;
-    static constexpr auto Name() { return "com/mapbox/mapboxsdk/style/layers/<%- camelize(type) %>Layer"; };
-
-<% if (type === 'background') { -%>
-    <%- camelize(type) %>Layer(jni::JNIEnv&, jni::String&);
-<% } else { -%>
-    <%- camelize(type) %>Layer(jni::JNIEnv&, jni::String&, jni::String&);
-<% } -%>
-
-    <%- camelize(type) %>Layer(mbgl::style::<%- camelize(type) %>Layer&);
-
-    <%- camelize(type) %>Layer(std::unique_ptr<mbgl::style::<%- camelize(type) %>Layer>);
-
-    ~<%- camelize(type) %>Layer();
-
-    // Properties
-<% for (const property of properties) { -%>
-
-    jni::Local<jni::Object<jni::ObjectTag>> get<%- camelize(property.name) %>(jni::JNIEnv&);
-<% if (property.transition) { -%>
-    void set<%- camelize(property.name) %>Transition(jni::JNIEnv&, jlong duration, jlong delay);
-    jni::Local<jni::Object<TransitionOptions>> get<%- camelize(property.name) %>Transition(jni::JNIEnv&);
-<% } -%>
-<% } -%>
-
-}; // class <%- camelize(type) %>Layer
-
-class <%- camelize(type) %>JavaLayerPeerFactory final : public JavaLayerPeerFactory,  public mbgl::<%- camelize(type) %>LayerFactory {
-public:
-    ~<%- camelize(type) %>JavaLayerPeerFactory() override;
-
-    // JavaLayerPeerFactory overrides.
-    jni::Local<jni::Object<Layer>> createJavaLayerPeer(jni::JNIEnv&, mbgl::style::Layer&) final;
-    jni::Local<jni::Object<Layer>> createJavaLayerPeer(jni::JNIEnv& env, std::unique_ptr<mbgl::style::Layer>) final;
-
-    void registerNative(jni::JNIEnv&) final;
-
-    LayerFactory* getLayerFactory() final { return this; }
-
-};  // class <%- camelize(type) %>JavaLayerPeerFactory
-
-} // namespace android
-} // namespace mbgl
diff --git a/platform/android/src/style/layers/layer_manager.cpp b/platform/android/src/style/layers/layer_manager.cpp
deleted file mode 100644
index 2d4172a235..0000000000
--- a/platform/android/src/style/layers/layer_manager.cpp
+++ /dev/null
@@ -1,173 +0,0 @@
-#include "layer_manager.hpp"
-
-#include <mbgl/style/layer_impl.hpp>
-
-#include <mbgl/style/conversion/constant.hpp>
-#include <mbgl/style/conversion/filter.hpp>
-#include <mbgl/style/conversion_impl.hpp>
-
-#include "background_layer.hpp"
-#include "circle_layer.hpp"
-#include "custom_layer.hpp"
-#include "fill_extrusion_layer.hpp"
-#include "fill_layer.hpp"
-#include "heatmap_layer.hpp"
-#include "hillshade_layer.hpp"
-#include "line_layer.hpp"
-#include "raster_layer.hpp"
-#include "symbol_layer.hpp"
-#include "fill_extrusion_layer.hpp"
-
-namespace mbgl {
-
-namespace android {
-
-LayerManagerAndroid::LayerManagerAndroid() {
-#if defined(MBGL_LAYER_FILL_DISABLE_RUNTIME)
-    addLayerTypeCoreOnly(std::make_unique<FillLayerFactory>());
-#elif !defined(MBGL_LAYER_FILL_DISABLE_ALL)
-    addLayerType(std::make_unique<FillJavaLayerPeerFactory>());
-#endif
-#if defined(MBGL_LAYER_LINE_DISABLE_RUNTIME)
-    addLayerTypeCoreOnly(std::make_unique<LineLayerFactory>());
-#elif !defined(MBGL_LAYER_LINE_DISABLE_ALL)
-    addLayerType(std::make_unique<LineJavaLayerPeerFactory>());
-#endif
-#if defined(MBGL_LAYER_CIRCLE_DISABLE_RUNTIME)
-    addLayerTypeCoreOnly(std::make_unique<CircleLayerFactory>());
-#elif !defined(MBGL_LAYER_CIRCLE_DISABLE_ALL)
-    addLayerType(std::make_unique<CircleJavaLayerPeerFactory>());
-#endif
-#if defined(MBGL_LAYER_SYMBOL_DISABLE_RUNTIME)
-    addLayerTypeCoreOnly(std::make_unique<SymbolLayerFactory>());
-#elif !defined(MBGL_LAYER_SYMBOL_DISABLE_ALL)
-    addLayerType(std::make_unique<SymbolJavaLayerPeerFactory>());
-#endif
-#if defined(MBGL_LAYER_RASTER_DISABLE_RUNTIME)
-    addLayerTypeCoreOnly(std::make_unique<RasterLayerFactory>());
-#elif !defined(MBGL_LAYER_RASTER_DISABLE_ALL)
-    addLayerType(std::make_unique<RasterJavaLayerPeerFactory>());
-#endif
-#if defined(MBGL_LAYER_BACKGROUND_DISABLE_RUNTIME)
-    addLayerTypeCoreOnly(std::make_unique<BackgroundLayerFactory>());
-#elif !defined(MBGL_LAYER_BACKGROUND_DISABLE_ALL)
-    addLayerType(std::make_unique<BackgroundJavaLayerPeerFactory>());
-#endif
-#if defined(MBGL_LAYER_HILLSHADE_DISABLE_RUNTIME)
-    addLayerTypeCoreOnly(std::make_unique<HillshadeLayerFactory>());
-#elif !defined(MBGL_LAYER_HILLSHADE_DISABLE_ALL)
-    addLayerType(std::make_unique<HillshadeJavaLayerPeerFactory>());
-#endif
-#if defined(MBGL_LAYER_FILL_EXTRUSION_DISABLE_RUNTIME)
-    addLayerTypeCoreOnly(std::make_unique<FillExtrusionLayerFactory>());
-#elif !defined(MBGL_LAYER_FILL_EXTRUSION_DISABLE_ALL)
-    addLayerType(std::make_unique<FillExtrusionJavaLayerPeerFactory>());
-#endif
-#if defined(MBGL_LAYER_HEATMAP_DISABLE_RUNTIME)
-    addLayerTypeCoreOnly(std::make_unique<HeatmapLayerFactory>());
-#elif !defined(MBGL_LAYER_HEATMAP_DISABLE_ALL)
-    addLayerType(std::make_unique<HeatmapJavaLayerPeerFactory>());
-#endif
-#if defined(MBGL_LAYER_CUSTOM_DISABLE_RUNTIME)
-    addLayerTypeCoreOnly(std::make_unique<CustomLayerFactory>());
-#elif !defined(MBGL_LAYER_CUSTOM_DISABLE_ALL)
-    addLayerType(std::make_unique<CustomJavaLayerPeerFactory>());
-#endif
-}
-
-LayerManagerAndroid::~LayerManagerAndroid() = default;
-
-jni::Local<jni::Object<Layer>> LayerManagerAndroid::createJavaLayerPeer(jni::JNIEnv& env, mbgl::style::Layer& layer) {
-    if (JavaLayerPeerFactory* factory = getPeerFactory(layer.getTypeInfo())) {
-        return factory->createJavaLayerPeer(env, layer);
-    }
-    return jni::Local<jni::Object<Layer>>();
-}
-
-jni::Local<jni::Object<Layer>> LayerManagerAndroid::createJavaLayerPeer(jni::JNIEnv& env,
-                                                                        std::unique_ptr<mbgl::style::Layer> layer) {
-    if (JavaLayerPeerFactory* factory = getPeerFactory(layer->getTypeInfo())) {
-        return factory->createJavaLayerPeer(env, std::move(layer));
-    }
-    return jni::Local<jni::Object<Layer>>();
-}
-
-void LayerManagerAndroid::registerNative(jni::JNIEnv& env) {
-    if (peerFactories.empty()) {
-        return;
-    }
-
-    Layer::registerNative(env);
-    for (const auto& factory: peerFactories) {
-        factory->registerNative(env);
-    }
-}
-
-void LayerManagerAndroid::addLayerType(std::unique_ptr<JavaLayerPeerFactory> factory) {
-    assert(getFactory(factory->getLayerFactory()->getTypeInfo()) == nullptr);
-    registerCoreFactory(factory->getLayerFactory());
-    peerFactories.emplace_back(std::move(factory));
-}
-
-void LayerManagerAndroid::addLayerTypeCoreOnly(std::unique_ptr<LayerFactory> factory) {
-    assert(getFactory(factory->getTypeInfo()) == nullptr);
-    registerCoreFactory(factory.get());
-    coreFactories.emplace_back(std::move(factory));
-}
-
-void LayerManagerAndroid::registerCoreFactory(mbgl::LayerFactory* factory) {
-    std::string type{factory->getTypeInfo()->type};
-    if (!type.empty()) {
-        assert(typeToFactory.find(type) == typeToFactory.end());
-        typeToFactory.emplace(std::make_pair(std::move(type), factory));
-    }
-}
-
-JavaLayerPeerFactory* LayerManagerAndroid::getPeerFactory(const mbgl::style::LayerTypeInfo* typeInfo) {
-    assert(typeInfo);
-    for (const auto& factory: peerFactories) {
-        if (factory->getLayerFactory()->getTypeInfo() == typeInfo) {
-            return factory.get();
-        }
-    }
-    return nullptr;
-}
-
-LayerFactory* LayerManagerAndroid::getFactory(const std::string& type) noexcept {
-    auto search = typeToFactory.find(type);
-    return (search != typeToFactory.end()) ? search->second : nullptr;
-}
-
-LayerFactory* LayerManagerAndroid::getFactory(const mbgl::style::LayerTypeInfo* info) noexcept {
-    if (JavaLayerPeerFactory* peerFactory = getPeerFactory(info)) {
-        return peerFactory->getLayerFactory();
-    }
-
-    for (const auto& factory: coreFactories) {
-        if (factory->getTypeInfo() == info) {
-            return factory.get();
-        }
-    }
-
-    return nullptr;
-}
-
-// static
-LayerManagerAndroid* LayerManagerAndroid::get() noexcept {
-    static LayerManagerAndroid impl;
-    return &impl;
-}
-
-} // namespace android
-
-LayerManager* LayerManager::get() noexcept {
-    return android::LayerManagerAndroid::get();
-}
-
-#if defined(MBGL_LAYER_LINE_DISABLE_ALL) || defined(MBGL_LAYER_SYMBOL_DISABLE_ALL) || defined(MBGL_LAYER_FILL_DISABLE_ALL)
-const bool LayerManager::annotationsEnabled = false;
-#else
-const bool LayerManager::annotationsEnabled = true;
-#endif
-
-} // namespace mbgl
diff --git a/platform/android/src/style/layers/layer_manager.hpp b/platform/android/src/style/layers/layer_manager.hpp
deleted file mode 100644
index f7379f6de6..0000000000
--- a/platform/android/src/style/layers/layer_manager.hpp
+++ /dev/null
@@ -1,57 +0,0 @@
-#pragma once
-
-#include <mbgl/layermanager/layer_manager.hpp>
-#include <mbgl/map/map.hpp>
-#include <mbgl/style/layer.hpp>
-
-#include "layer.hpp"
-
-#include <jni/jni.hpp>
-
-#include <memory>
-#include <vector>
-
-namespace mbgl {
-namespace android {
-
-/**
- * @brief A singleton class forwarding calls to the corresponding  \c JavaLayerPeerFactory instance.
- */
-class LayerManagerAndroid final : public mbgl::LayerManager {
-public:
-    ~LayerManagerAndroid() final;
-    static LayerManagerAndroid* get() noexcept;
-
-    jni::Local<jni::Object<Layer>> createJavaLayerPeer(jni::JNIEnv&, mbgl::style::Layer&);
-    jni::Local<jni::Object<Layer>> createJavaLayerPeer(jni::JNIEnv& env, std::unique_ptr<mbgl::style::Layer>);
-
-    void registerNative(jni::JNIEnv&);
-
-private:
-    LayerManagerAndroid();
-    /**
-     * @brief Enables a layer type for both JSON style and runtime API.
-     */
-    void addLayerType(std::unique_ptr<JavaLayerPeerFactory>); 
-    /**
-     * @brief Enables a layer type for JSON style only.
-     *
-     * We might not want to expose runtime API for some layer types
-     * in order to save binary size - JNI glue code for these layer types
-     * won't be added to the binary. 
-     */
-    void addLayerTypeCoreOnly(std::unique_ptr<mbgl::LayerFactory>);
-
-    void registerCoreFactory(mbgl::LayerFactory*);
-    JavaLayerPeerFactory* getPeerFactory(const mbgl::style::LayerTypeInfo*);
-    // mbgl::LayerManager overrides.
-    LayerFactory* getFactory(const std::string& type) noexcept final;
-    LayerFactory* getFactory(const mbgl::style::LayerTypeInfo* info) noexcept final;
-
-    std::vector<std::unique_ptr<JavaLayerPeerFactory>> peerFactories;
-    std::vector<std::unique_ptr<mbgl::LayerFactory>> coreFactories;
-    std::map<std::string, mbgl::LayerFactory*> typeToFactory;
-};
-
-}  // namespace android
-}  // namespace mbgl
diff --git a/platform/android/src/style/layers/line_layer.cpp b/platform/android/src/style/layers/line_layer.cpp
deleted file mode 100644
index 89c6cb5323..0000000000
--- a/platform/android/src/style/layers/line_layer.cpp
+++ /dev/null
@@ -1,315 +0,0 @@
-// This file is generated. Edit android/platform/scripts/generate-style-code.js, then run `make android-style-code`.
-
-#include "line_layer.hpp"
-
-#include <string>
-
-#include "../conversion/property_value.hpp"
-#include "../conversion/transition_options.hpp"
-
-#include <mbgl/style/layer_impl.hpp>
-
-namespace mbgl {
-namespace android {
-
-    inline mbgl::style::LineLayer& toLineLayer(mbgl::style::Layer& layer) {
-        return static_cast<mbgl::style::LineLayer&>(layer);
-    }
-
-    /**
-     * Creates an owning peer object (for layers not attached to the map) from the JVM side
-     */
-    LineLayer::LineLayer(jni::JNIEnv& env, jni::String& layerId, jni::String& sourceId)
-        : Layer(std::make_unique<mbgl::style::LineLayer>(jni::Make<std::string>(env, layerId), jni::Make<std::string>(env, sourceId))) {
-    }
-
-    /**
-     * Creates a non-owning peer object (for layers currently attached to the map)
-     */
-    LineLayer::LineLayer(mbgl::style::LineLayer& coreLayer) : Layer(coreLayer) {}
-
-    /**
-     * Creates an owning peer object (for layers not attached to the map)
-     */
-    LineLayer::LineLayer(std::unique_ptr<mbgl::style::LineLayer> coreLayer) : Layer(std::move(coreLayer)) {}
-
-    LineLayer::~LineLayer() = default;
-
-    // Property getters
-
-    jni::Local<jni::Object<>> LineLayer::getLineCap(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        return std::move(*convert<jni::Local<jni::Object<>>>(env, toLineLayer(layer).getLineCap()));
-    }
-
-    jni::Local<jni::Object<>> LineLayer::getLineJoin(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        return std::move(*convert<jni::Local<jni::Object<>>>(env, toLineLayer(layer).getLineJoin()));
-    }
-
-    jni::Local<jni::Object<>> LineLayer::getLineMiterLimit(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        return std::move(*convert<jni::Local<jni::Object<>>>(env, toLineLayer(layer).getLineMiterLimit()));
-    }
-
-    jni::Local<jni::Object<>> LineLayer::getLineRoundLimit(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        return std::move(*convert<jni::Local<jni::Object<>>>(env, toLineLayer(layer).getLineRoundLimit()));
-    }
-
-    jni::Local<jni::Object<>> LineLayer::getLineSortKey(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        return std::move(*convert<jni::Local<jni::Object<>>>(env, toLineLayer(layer).getLineSortKey()));
-    }
-
-    jni::Local<jni::Object<>> LineLayer::getLineOpacity(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        return std::move(*convert<jni::Local<jni::Object<>>>(env, toLineLayer(layer).getLineOpacity()));
-    }
-
-    jni::Local<jni::Object<TransitionOptions>> LineLayer::getLineOpacityTransition(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        mbgl::style::TransitionOptions options = toLineLayer(layer).getLineOpacityTransition();
-        return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, options));
-    }
-
-    void LineLayer::setLineOpacityTransition(jni::JNIEnv&, jlong duration, jlong delay) {
-        mbgl::style::TransitionOptions options;
-        options.duration.emplace(mbgl::Milliseconds(duration));
-        options.delay.emplace(mbgl::Milliseconds(delay));
-        toLineLayer(layer).setLineOpacityTransition(options);
-    }
-
-    jni::Local<jni::Object<>> LineLayer::getLineColor(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        return std::move(*convert<jni::Local<jni::Object<>>>(env, toLineLayer(layer).getLineColor()));
-    }
-
-    jni::Local<jni::Object<TransitionOptions>> LineLayer::getLineColorTransition(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        mbgl::style::TransitionOptions options = toLineLayer(layer).getLineColorTransition();
-        return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, options));
-    }
-
-    void LineLayer::setLineColorTransition(jni::JNIEnv&, jlong duration, jlong delay) {
-        mbgl::style::TransitionOptions options;
-        options.duration.emplace(mbgl::Milliseconds(duration));
-        options.delay.emplace(mbgl::Milliseconds(delay));
-        toLineLayer(layer).setLineColorTransition(options);
-    }
-
-    jni::Local<jni::Object<>> LineLayer::getLineTranslate(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        return std::move(*convert<jni::Local<jni::Object<>>>(env, toLineLayer(layer).getLineTranslate()));
-    }
-
-    jni::Local<jni::Object<TransitionOptions>> LineLayer::getLineTranslateTransition(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        mbgl::style::TransitionOptions options = toLineLayer(layer).getLineTranslateTransition();
-        return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, options));
-    }
-
-    void LineLayer::setLineTranslateTransition(jni::JNIEnv&, jlong duration, jlong delay) {
-        mbgl::style::TransitionOptions options;
-        options.duration.emplace(mbgl::Milliseconds(duration));
-        options.delay.emplace(mbgl::Milliseconds(delay));
-        toLineLayer(layer).setLineTranslateTransition(options);
-    }
-
-    jni::Local<jni::Object<>> LineLayer::getLineTranslateAnchor(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        return std::move(*convert<jni::Local<jni::Object<>>>(env, toLineLayer(layer).getLineTranslateAnchor()));
-    }
-
-    jni::Local<jni::Object<>> LineLayer::getLineWidth(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        return std::move(*convert<jni::Local<jni::Object<>>>(env, toLineLayer(layer).getLineWidth()));
-    }
-
-    jni::Local<jni::Object<TransitionOptions>> LineLayer::getLineWidthTransition(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        mbgl::style::TransitionOptions options = toLineLayer(layer).getLineWidthTransition();
-        return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, options));
-    }
-
-    void LineLayer::setLineWidthTransition(jni::JNIEnv&, jlong duration, jlong delay) {
-        mbgl::style::TransitionOptions options;
-        options.duration.emplace(mbgl::Milliseconds(duration));
-        options.delay.emplace(mbgl::Milliseconds(delay));
-        toLineLayer(layer).setLineWidthTransition(options);
-    }
-
-    jni::Local<jni::Object<>> LineLayer::getLineGapWidth(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        return std::move(*convert<jni::Local<jni::Object<>>>(env, toLineLayer(layer).getLineGapWidth()));
-    }
-
-    jni::Local<jni::Object<TransitionOptions>> LineLayer::getLineGapWidthTransition(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        mbgl::style::TransitionOptions options = toLineLayer(layer).getLineGapWidthTransition();
-        return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, options));
-    }
-
-    void LineLayer::setLineGapWidthTransition(jni::JNIEnv&, jlong duration, jlong delay) {
-        mbgl::style::TransitionOptions options;
-        options.duration.emplace(mbgl::Milliseconds(duration));
-        options.delay.emplace(mbgl::Milliseconds(delay));
-        toLineLayer(layer).setLineGapWidthTransition(options);
-    }
-
-    jni::Local<jni::Object<>> LineLayer::getLineOffset(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        return std::move(*convert<jni::Local<jni::Object<>>>(env, toLineLayer(layer).getLineOffset()));
-    }
-
-    jni::Local<jni::Object<TransitionOptions>> LineLayer::getLineOffsetTransition(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        mbgl::style::TransitionOptions options = toLineLayer(layer).getLineOffsetTransition();
-        return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, options));
-    }
-
-    void LineLayer::setLineOffsetTransition(jni::JNIEnv&, jlong duration, jlong delay) {
-        mbgl::style::TransitionOptions options;
-        options.duration.emplace(mbgl::Milliseconds(duration));
-        options.delay.emplace(mbgl::Milliseconds(delay));
-        toLineLayer(layer).setLineOffsetTransition(options);
-    }
-
-    jni::Local<jni::Object<>> LineLayer::getLineBlur(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        return std::move(*convert<jni::Local<jni::Object<>>>(env, toLineLayer(layer).getLineBlur()));
-    }
-
-    jni::Local<jni::Object<TransitionOptions>> LineLayer::getLineBlurTransition(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        mbgl::style::TransitionOptions options = toLineLayer(layer).getLineBlurTransition();
-        return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, options));
-    }
-
-    void LineLayer::setLineBlurTransition(jni::JNIEnv&, jlong duration, jlong delay) {
-        mbgl::style::TransitionOptions options;
-        options.duration.emplace(mbgl::Milliseconds(duration));
-        options.delay.emplace(mbgl::Milliseconds(delay));
-        toLineLayer(layer).setLineBlurTransition(options);
-    }
-
-    jni::Local<jni::Object<>> LineLayer::getLineDasharray(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        return std::move(*convert<jni::Local<jni::Object<>>>(env, toLineLayer(layer).getLineDasharray()));
-    }
-
-    jni::Local<jni::Object<TransitionOptions>> LineLayer::getLineDasharrayTransition(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        mbgl::style::TransitionOptions options = toLineLayer(layer).getLineDasharrayTransition();
-        return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, options));
-    }
-
-    void LineLayer::setLineDasharrayTransition(jni::JNIEnv&, jlong duration, jlong delay) {
-        mbgl::style::TransitionOptions options;
-        options.duration.emplace(mbgl::Milliseconds(duration));
-        options.delay.emplace(mbgl::Milliseconds(delay));
-        toLineLayer(layer).setLineDasharrayTransition(options);
-    }
-
-    jni::Local<jni::Object<>> LineLayer::getLinePattern(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        return std::move(*convert<jni::Local<jni::Object<>>>(env, toLineLayer(layer).getLinePattern()));
-    }
-
-    jni::Local<jni::Object<TransitionOptions>> LineLayer::getLinePatternTransition(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        mbgl::style::TransitionOptions options = toLineLayer(layer).getLinePatternTransition();
-        return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, options));
-    }
-
-    void LineLayer::setLinePatternTransition(jni::JNIEnv&, jlong duration, jlong delay) {
-        mbgl::style::TransitionOptions options;
-        options.duration.emplace(mbgl::Milliseconds(duration));
-        options.delay.emplace(mbgl::Milliseconds(delay));
-        toLineLayer(layer).setLinePatternTransition(options);
-    }
-
-    jni::Local<jni::Object<>> LineLayer::getLineGradient(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        return std::move(*convert<jni::Local<jni::Object<>>>(env, toLineLayer(layer).getLineGradient()));
-    }
-
-
-    // LineJavaLayerPeerFactory
-
-    LineJavaLayerPeerFactory::~LineJavaLayerPeerFactory() = default;
-
-    namespace {
-        jni::Local<jni::Object<Layer>> createJavaPeer(jni::JNIEnv& env, Layer* layer) {
-            static auto& javaClass = jni::Class<LineLayer>::Singleton(env);
-            static auto constructor = javaClass.GetConstructor<jni::jlong>(env);
-            return javaClass.New(env, constructor, reinterpret_cast<jni::jlong>(layer));
-        }
-    }  // namespace
-
-    jni::Local<jni::Object<Layer>> LineJavaLayerPeerFactory::createJavaLayerPeer(jni::JNIEnv& env,
-                                                                                 mbgl::style::Layer& layer) {
-        assert(layer.baseImpl->getTypeInfo() == getTypeInfo());
-        return createJavaPeer(env, new LineLayer(toLineLayer(layer)));
-    }
-
-    jni::Local<jni::Object<Layer>> LineJavaLayerPeerFactory::createJavaLayerPeer(
-        jni::JNIEnv& env, std::unique_ptr<mbgl::style::Layer> layer) {
-        assert(layer->baseImpl->getTypeInfo() == getTypeInfo());
-        return createJavaPeer(env,
-                              new LineLayer(std::unique_ptr<mbgl::style::LineLayer>(
-                                  static_cast<mbgl::style::LineLayer*>(layer.release()))));
-    }
-
-    void LineJavaLayerPeerFactory::registerNative(jni::JNIEnv& env) {
-        // Lookup the class
-        static auto& javaClass = jni::Class<LineLayer>::Singleton(env);
-
-        #define METHOD(MethodPtr, name) jni::MakeNativePeerMethod<decltype(MethodPtr), (MethodPtr)>(name)
-
-        // Register the peer
-        jni::RegisterNativePeer<LineLayer>(
-            env,
-            javaClass,
-            "nativePtr",
-            jni::MakePeer<LineLayer, jni::String&, jni::String&>,
-            "initialize",
-            "finalize",
-            METHOD(&LineLayer::getLineCap, "nativeGetLineCap"),
-            METHOD(&LineLayer::getLineJoin, "nativeGetLineJoin"),
-            METHOD(&LineLayer::getLineMiterLimit, "nativeGetLineMiterLimit"),
-            METHOD(&LineLayer::getLineRoundLimit, "nativeGetLineRoundLimit"),
-            METHOD(&LineLayer::getLineSortKey, "nativeGetLineSortKey"),
-            METHOD(&LineLayer::getLineOpacityTransition, "nativeGetLineOpacityTransition"),
-            METHOD(&LineLayer::setLineOpacityTransition, "nativeSetLineOpacityTransition"),
-            METHOD(&LineLayer::getLineOpacity, "nativeGetLineOpacity"),
-            METHOD(&LineLayer::getLineColorTransition, "nativeGetLineColorTransition"),
-            METHOD(&LineLayer::setLineColorTransition, "nativeSetLineColorTransition"),
-            METHOD(&LineLayer::getLineColor, "nativeGetLineColor"),
-            METHOD(&LineLayer::getLineTranslateTransition, "nativeGetLineTranslateTransition"),
-            METHOD(&LineLayer::setLineTranslateTransition, "nativeSetLineTranslateTransition"),
-            METHOD(&LineLayer::getLineTranslate, "nativeGetLineTranslate"),
-            METHOD(&LineLayer::getLineTranslateAnchor, "nativeGetLineTranslateAnchor"),
-            METHOD(&LineLayer::getLineWidthTransition, "nativeGetLineWidthTransition"),
-            METHOD(&LineLayer::setLineWidthTransition, "nativeSetLineWidthTransition"),
-            METHOD(&LineLayer::getLineWidth, "nativeGetLineWidth"),
-            METHOD(&LineLayer::getLineGapWidthTransition, "nativeGetLineGapWidthTransition"),
-            METHOD(&LineLayer::setLineGapWidthTransition, "nativeSetLineGapWidthTransition"),
-            METHOD(&LineLayer::getLineGapWidth, "nativeGetLineGapWidth"),
-            METHOD(&LineLayer::getLineOffsetTransition, "nativeGetLineOffsetTransition"),
-            METHOD(&LineLayer::setLineOffsetTransition, "nativeSetLineOffsetTransition"),
-            METHOD(&LineLayer::getLineOffset, "nativeGetLineOffset"),
-            METHOD(&LineLayer::getLineBlurTransition, "nativeGetLineBlurTransition"),
-            METHOD(&LineLayer::setLineBlurTransition, "nativeSetLineBlurTransition"),
-            METHOD(&LineLayer::getLineBlur, "nativeGetLineBlur"),
-            METHOD(&LineLayer::getLineDasharrayTransition, "nativeGetLineDasharrayTransition"),
-            METHOD(&LineLayer::setLineDasharrayTransition, "nativeSetLineDasharrayTransition"),
-            METHOD(&LineLayer::getLineDasharray, "nativeGetLineDasharray"),
-            METHOD(&LineLayer::getLinePatternTransition, "nativeGetLinePatternTransition"),
-            METHOD(&LineLayer::setLinePatternTransition, "nativeSetLinePatternTransition"),
-            METHOD(&LineLayer::getLinePattern, "nativeGetLinePattern"),
-            METHOD(&LineLayer::getLineGradient, "nativeGetLineGradient"));
-    }
-
-} // namespace android
-} // namespace mbgl
diff --git a/platform/android/src/style/layers/line_layer.hpp b/platform/android/src/style/layers/line_layer.hpp
deleted file mode 100644
index 25b270fbc6..0000000000
--- a/platform/android/src/style/layers/line_layer.hpp
+++ /dev/null
@@ -1,96 +0,0 @@
-// This file is generated. Edit android/platform/scripts/generate-style-code.js, then run `make android-style-code`.
-
-#pragma once
-
-#include "layer.hpp"
-#include "../transition_options.hpp"
-#include <mbgl/layermanager/line_layer_factory.hpp>
-#include <mbgl/style/layers/line_layer.hpp>
-#include <jni/jni.hpp>
-
-namespace mbgl {
-namespace android {
-
-class LineLayer : public Layer {
-public:
-    using SuperTag = Layer;
-    static constexpr auto Name() { return "com/mapbox/mapboxsdk/style/layers/LineLayer"; };
-
-    LineLayer(jni::JNIEnv&, jni::String&, jni::String&);
-
-    LineLayer(mbgl::style::LineLayer&);
-
-    LineLayer(std::unique_ptr<mbgl::style::LineLayer>);
-
-    ~LineLayer();
-
-    // Properties
-
-    jni::Local<jni::Object<jni::ObjectTag>> getLineCap(jni::JNIEnv&);
-
-    jni::Local<jni::Object<jni::ObjectTag>> getLineJoin(jni::JNIEnv&);
-
-    jni::Local<jni::Object<jni::ObjectTag>> getLineMiterLimit(jni::JNIEnv&);
-
-    jni::Local<jni::Object<jni::ObjectTag>> getLineRoundLimit(jni::JNIEnv&);
-
-    jni::Local<jni::Object<jni::ObjectTag>> getLineSortKey(jni::JNIEnv&);
-
-    jni::Local<jni::Object<jni::ObjectTag>> getLineOpacity(jni::JNIEnv&);
-    void setLineOpacityTransition(jni::JNIEnv&, jlong duration, jlong delay);
-    jni::Local<jni::Object<TransitionOptions>> getLineOpacityTransition(jni::JNIEnv&);
-
-    jni::Local<jni::Object<jni::ObjectTag>> getLineColor(jni::JNIEnv&);
-    void setLineColorTransition(jni::JNIEnv&, jlong duration, jlong delay);
-    jni::Local<jni::Object<TransitionOptions>> getLineColorTransition(jni::JNIEnv&);
-
-    jni::Local<jni::Object<jni::ObjectTag>> getLineTranslate(jni::JNIEnv&);
-    void setLineTranslateTransition(jni::JNIEnv&, jlong duration, jlong delay);
-    jni::Local<jni::Object<TransitionOptions>> getLineTranslateTransition(jni::JNIEnv&);
-
-    jni::Local<jni::Object<jni::ObjectTag>> getLineTranslateAnchor(jni::JNIEnv&);
-
-    jni::Local<jni::Object<jni::ObjectTag>> getLineWidth(jni::JNIEnv&);
-    void setLineWidthTransition(jni::JNIEnv&, jlong duration, jlong delay);
-    jni::Local<jni::Object<TransitionOptions>> getLineWidthTransition(jni::JNIEnv&);
-
-    jni::Local<jni::Object<jni::ObjectTag>> getLineGapWidth(jni::JNIEnv&);
-    void setLineGapWidthTransition(jni::JNIEnv&, jlong duration, jlong delay);
-    jni::Local<jni::Object<TransitionOptions>> getLineGapWidthTransition(jni::JNIEnv&);
-
-    jni::Local<jni::Object<jni::ObjectTag>> getLineOffset(jni::JNIEnv&);
-    void setLineOffsetTransition(jni::JNIEnv&, jlong duration, jlong delay);
-    jni::Local<jni::Object<TransitionOptions>> getLineOffsetTransition(jni::JNIEnv&);
-
-    jni::Local<jni::Object<jni::ObjectTag>> getLineBlur(jni::JNIEnv&);
-    void setLineBlurTransition(jni::JNIEnv&, jlong duration, jlong delay);
-    jni::Local<jni::Object<TransitionOptions>> getLineBlurTransition(jni::JNIEnv&);
-
-    jni::Local<jni::Object<jni::ObjectTag>> getLineDasharray(jni::JNIEnv&);
-    void setLineDasharrayTransition(jni::JNIEnv&, jlong duration, jlong delay);
-    jni::Local<jni::Object<TransitionOptions>> getLineDasharrayTransition(jni::JNIEnv&);
-
-    jni::Local<jni::Object<jni::ObjectTag>> getLinePattern(jni::JNIEnv&);
-    void setLinePatternTransition(jni::JNIEnv&, jlong duration, jlong delay);
-    jni::Local<jni::Object<TransitionOptions>> getLinePatternTransition(jni::JNIEnv&);
-
-    jni::Local<jni::Object<jni::ObjectTag>> getLineGradient(jni::JNIEnv&);
-
-}; // class LineLayer
-
-class LineJavaLayerPeerFactory final : public JavaLayerPeerFactory,  public mbgl::LineLayerFactory {
-public:
-    ~LineJavaLayerPeerFactory() override;
-
-    // JavaLayerPeerFactory overrides.
-    jni::Local<jni::Object<Layer>> createJavaLayerPeer(jni::JNIEnv&, mbgl::style::Layer&) final;
-    jni::Local<jni::Object<Layer>> createJavaLayerPeer(jni::JNIEnv& env, std::unique_ptr<mbgl::style::Layer>) final;
-
-    void registerNative(jni::JNIEnv&) final;
-
-    LayerFactory* getLayerFactory() final { return this; }
-
-};  // class LineJavaLayerPeerFactory
-
-} // namespace android
-} // namespace mbgl
diff --git a/platform/android/src/style/layers/raster_layer.cpp b/platform/android/src/style/layers/raster_layer.cpp
deleted file mode 100644
index d9cce949c2..0000000000
--- a/platform/android/src/style/layers/raster_layer.cpp
+++ /dev/null
@@ -1,222 +0,0 @@
-// This file is generated. Edit android/platform/scripts/generate-style-code.js, then run `make android-style-code`.
-
-#include "raster_layer.hpp"
-
-#include <string>
-
-#include "../conversion/property_value.hpp"
-#include "../conversion/transition_options.hpp"
-
-#include <mbgl/style/layer_impl.hpp>
-
-namespace mbgl {
-namespace android {
-
-    inline mbgl::style::RasterLayer& toRasterLayer(mbgl::style::Layer& layer) {
-        return static_cast<mbgl::style::RasterLayer&>(layer);
-    }
-
-    /**
-     * Creates an owning peer object (for layers not attached to the map) from the JVM side
-     */
-    RasterLayer::RasterLayer(jni::JNIEnv& env, jni::String& layerId, jni::String& sourceId)
-        : Layer(std::make_unique<mbgl::style::RasterLayer>(jni::Make<std::string>(env, layerId), jni::Make<std::string>(env, sourceId))) {
-    }
-
-    /**
-     * Creates a non-owning peer object (for layers currently attached to the map)
-     */
-    RasterLayer::RasterLayer(mbgl::style::RasterLayer& coreLayer) : Layer(coreLayer) {}
-
-    /**
-     * Creates an owning peer object (for layers not attached to the map)
-     */
-    RasterLayer::RasterLayer(std::unique_ptr<mbgl::style::RasterLayer> coreLayer) : Layer(std::move(coreLayer)) {}
-
-    RasterLayer::~RasterLayer() = default;
-
-    // Property getters
-
-    jni::Local<jni::Object<>> RasterLayer::getRasterOpacity(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        return std::move(*convert<jni::Local<jni::Object<>>>(env, toRasterLayer(layer).getRasterOpacity()));
-    }
-
-    jni::Local<jni::Object<TransitionOptions>> RasterLayer::getRasterOpacityTransition(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        mbgl::style::TransitionOptions options = toRasterLayer(layer).getRasterOpacityTransition();
-        return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, options));
-    }
-
-    void RasterLayer::setRasterOpacityTransition(jni::JNIEnv&, jlong duration, jlong delay) {
-        mbgl::style::TransitionOptions options;
-        options.duration.emplace(mbgl::Milliseconds(duration));
-        options.delay.emplace(mbgl::Milliseconds(delay));
-        toRasterLayer(layer).setRasterOpacityTransition(options);
-    }
-
-    jni::Local<jni::Object<>> RasterLayer::getRasterHueRotate(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        return std::move(*convert<jni::Local<jni::Object<>>>(env, toRasterLayer(layer).getRasterHueRotate()));
-    }
-
-    jni::Local<jni::Object<TransitionOptions>> RasterLayer::getRasterHueRotateTransition(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        mbgl::style::TransitionOptions options = toRasterLayer(layer).getRasterHueRotateTransition();
-        return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, options));
-    }
-
-    void RasterLayer::setRasterHueRotateTransition(jni::JNIEnv&, jlong duration, jlong delay) {
-        mbgl::style::TransitionOptions options;
-        options.duration.emplace(mbgl::Milliseconds(duration));
-        options.delay.emplace(mbgl::Milliseconds(delay));
-        toRasterLayer(layer).setRasterHueRotateTransition(options);
-    }
-
-    jni::Local<jni::Object<>> RasterLayer::getRasterBrightnessMin(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        return std::move(*convert<jni::Local<jni::Object<>>>(env, toRasterLayer(layer).getRasterBrightnessMin()));
-    }
-
-    jni::Local<jni::Object<TransitionOptions>> RasterLayer::getRasterBrightnessMinTransition(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        mbgl::style::TransitionOptions options = toRasterLayer(layer).getRasterBrightnessMinTransition();
-        return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, options));
-    }
-
-    void RasterLayer::setRasterBrightnessMinTransition(jni::JNIEnv&, jlong duration, jlong delay) {
-        mbgl::style::TransitionOptions options;
-        options.duration.emplace(mbgl::Milliseconds(duration));
-        options.delay.emplace(mbgl::Milliseconds(delay));
-        toRasterLayer(layer).setRasterBrightnessMinTransition(options);
-    }
-
-    jni::Local<jni::Object<>> RasterLayer::getRasterBrightnessMax(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        return std::move(*convert<jni::Local<jni::Object<>>>(env, toRasterLayer(layer).getRasterBrightnessMax()));
-    }
-
-    jni::Local<jni::Object<TransitionOptions>> RasterLayer::getRasterBrightnessMaxTransition(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        mbgl::style::TransitionOptions options = toRasterLayer(layer).getRasterBrightnessMaxTransition();
-        return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, options));
-    }
-
-    void RasterLayer::setRasterBrightnessMaxTransition(jni::JNIEnv&, jlong duration, jlong delay) {
-        mbgl::style::TransitionOptions options;
-        options.duration.emplace(mbgl::Milliseconds(duration));
-        options.delay.emplace(mbgl::Milliseconds(delay));
-        toRasterLayer(layer).setRasterBrightnessMaxTransition(options);
-    }
-
-    jni::Local<jni::Object<>> RasterLayer::getRasterSaturation(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        return std::move(*convert<jni::Local<jni::Object<>>>(env, toRasterLayer(layer).getRasterSaturation()));
-    }
-
-    jni::Local<jni::Object<TransitionOptions>> RasterLayer::getRasterSaturationTransition(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        mbgl::style::TransitionOptions options = toRasterLayer(layer).getRasterSaturationTransition();
-        return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, options));
-    }
-
-    void RasterLayer::setRasterSaturationTransition(jni::JNIEnv&, jlong duration, jlong delay) {
-        mbgl::style::TransitionOptions options;
-        options.duration.emplace(mbgl::Milliseconds(duration));
-        options.delay.emplace(mbgl::Milliseconds(delay));
-        toRasterLayer(layer).setRasterSaturationTransition(options);
-    }
-
-    jni::Local<jni::Object<>> RasterLayer::getRasterContrast(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        return std::move(*convert<jni::Local<jni::Object<>>>(env, toRasterLayer(layer).getRasterContrast()));
-    }
-
-    jni::Local<jni::Object<TransitionOptions>> RasterLayer::getRasterContrastTransition(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        mbgl::style::TransitionOptions options = toRasterLayer(layer).getRasterContrastTransition();
-        return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, options));
-    }
-
-    void RasterLayer::setRasterContrastTransition(jni::JNIEnv&, jlong duration, jlong delay) {
-        mbgl::style::TransitionOptions options;
-        options.duration.emplace(mbgl::Milliseconds(duration));
-        options.delay.emplace(mbgl::Milliseconds(delay));
-        toRasterLayer(layer).setRasterContrastTransition(options);
-    }
-
-    jni::Local<jni::Object<>> RasterLayer::getRasterResampling(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        return std::move(*convert<jni::Local<jni::Object<>>>(env, toRasterLayer(layer).getRasterResampling()));
-    }
-
-    jni::Local<jni::Object<>> RasterLayer::getRasterFadeDuration(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        return std::move(*convert<jni::Local<jni::Object<>>>(env, toRasterLayer(layer).getRasterFadeDuration()));
-    }
-
-
-    // RasterJavaLayerPeerFactory
-
-    RasterJavaLayerPeerFactory::~RasterJavaLayerPeerFactory() = default;
-
-    namespace {
-        jni::Local<jni::Object<Layer>> createJavaPeer(jni::JNIEnv& env, Layer* layer) {
-            static auto& javaClass = jni::Class<RasterLayer>::Singleton(env);
-            static auto constructor = javaClass.GetConstructor<jni::jlong>(env);
-            return javaClass.New(env, constructor, reinterpret_cast<jni::jlong>(layer));
-        }
-    }  // namespace
-
-    jni::Local<jni::Object<Layer>> RasterJavaLayerPeerFactory::createJavaLayerPeer(jni::JNIEnv& env,
-                                                                                   mbgl::style::Layer& layer) {
-        assert(layer.baseImpl->getTypeInfo() == getTypeInfo());
-        return createJavaPeer(env, new RasterLayer(toRasterLayer(layer)));
-    }
-
-    jni::Local<jni::Object<Layer>> RasterJavaLayerPeerFactory::createJavaLayerPeer(
-        jni::JNIEnv& env, std::unique_ptr<mbgl::style::Layer> layer) {
-        assert(layer->baseImpl->getTypeInfo() == getTypeInfo());
-        return createJavaPeer(env,
-                              new RasterLayer(std::unique_ptr<mbgl::style::RasterLayer>(
-                                  static_cast<mbgl::style::RasterLayer*>(layer.release()))));
-    }
-
-    void RasterJavaLayerPeerFactory::registerNative(jni::JNIEnv& env) {
-        // Lookup the class
-        static auto& javaClass = jni::Class<RasterLayer>::Singleton(env);
-
-        #define METHOD(MethodPtr, name) jni::MakeNativePeerMethod<decltype(MethodPtr), (MethodPtr)>(name)
-
-        // Register the peer
-        jni::RegisterNativePeer<RasterLayer>(
-            env,
-            javaClass,
-            "nativePtr",
-            jni::MakePeer<RasterLayer, jni::String&, jni::String&>,
-            "initialize",
-            "finalize",
-            METHOD(&RasterLayer::getRasterOpacityTransition, "nativeGetRasterOpacityTransition"),
-            METHOD(&RasterLayer::setRasterOpacityTransition, "nativeSetRasterOpacityTransition"),
-            METHOD(&RasterLayer::getRasterOpacity, "nativeGetRasterOpacity"),
-            METHOD(&RasterLayer::getRasterHueRotateTransition, "nativeGetRasterHueRotateTransition"),
-            METHOD(&RasterLayer::setRasterHueRotateTransition, "nativeSetRasterHueRotateTransition"),
-            METHOD(&RasterLayer::getRasterHueRotate, "nativeGetRasterHueRotate"),
-            METHOD(&RasterLayer::getRasterBrightnessMinTransition, "nativeGetRasterBrightnessMinTransition"),
-            METHOD(&RasterLayer::setRasterBrightnessMinTransition, "nativeSetRasterBrightnessMinTransition"),
-            METHOD(&RasterLayer::getRasterBrightnessMin, "nativeGetRasterBrightnessMin"),
-            METHOD(&RasterLayer::getRasterBrightnessMaxTransition, "nativeGetRasterBrightnessMaxTransition"),
-            METHOD(&RasterLayer::setRasterBrightnessMaxTransition, "nativeSetRasterBrightnessMaxTransition"),
-            METHOD(&RasterLayer::getRasterBrightnessMax, "nativeGetRasterBrightnessMax"),
-            METHOD(&RasterLayer::getRasterSaturationTransition, "nativeGetRasterSaturationTransition"),
-            METHOD(&RasterLayer::setRasterSaturationTransition, "nativeSetRasterSaturationTransition"),
-            METHOD(&RasterLayer::getRasterSaturation, "nativeGetRasterSaturation"),
-            METHOD(&RasterLayer::getRasterContrastTransition, "nativeGetRasterContrastTransition"),
-            METHOD(&RasterLayer::setRasterContrastTransition, "nativeSetRasterContrastTransition"),
-            METHOD(&RasterLayer::getRasterContrast, "nativeGetRasterContrast"),
-            METHOD(&RasterLayer::getRasterResampling, "nativeGetRasterResampling"),
-            METHOD(&RasterLayer::getRasterFadeDuration, "nativeGetRasterFadeDuration"));
-    }
-
-} // namespace android
-} // namespace mbgl
diff --git a/platform/android/src/style/layers/raster_layer.hpp b/platform/android/src/style/layers/raster_layer.hpp
deleted file mode 100644
index bbda2e0c57..0000000000
--- a/platform/android/src/style/layers/raster_layer.hpp
+++ /dev/null
@@ -1,74 +0,0 @@
-// This file is generated. Edit android/platform/scripts/generate-style-code.js, then run `make android-style-code`.
-
-#pragma once
-
-#include "layer.hpp"
-#include "../transition_options.hpp"
-#include <mbgl/layermanager/raster_layer_factory.hpp>
-#include <mbgl/style/layers/raster_layer.hpp>
-#include <jni/jni.hpp>
-
-namespace mbgl {
-namespace android {
-
-class RasterLayer : public Layer {
-public:
-    using SuperTag = Layer;
-    static constexpr auto Name() { return "com/mapbox/mapboxsdk/style/layers/RasterLayer"; };
-
-    RasterLayer(jni::JNIEnv&, jni::String&, jni::String&);
-
-    RasterLayer(mbgl::style::RasterLayer&);
-
-    RasterLayer(std::unique_ptr<mbgl::style::RasterLayer>);
-
-    ~RasterLayer();
-
-    // Properties
-
-    jni::Local<jni::Object<jni::ObjectTag>> getRasterOpacity(jni::JNIEnv&);
-    void setRasterOpacityTransition(jni::JNIEnv&, jlong duration, jlong delay);
-    jni::Local<jni::Object<TransitionOptions>> getRasterOpacityTransition(jni::JNIEnv&);
-
-    jni::Local<jni::Object<jni::ObjectTag>> getRasterHueRotate(jni::JNIEnv&);
-    void setRasterHueRotateTransition(jni::JNIEnv&, jlong duration, jlong delay);
-    jni::Local<jni::Object<TransitionOptions>> getRasterHueRotateTransition(jni::JNIEnv&);
-
-    jni::Local<jni::Object<jni::ObjectTag>> getRasterBrightnessMin(jni::JNIEnv&);
-    void setRasterBrightnessMinTransition(jni::JNIEnv&, jlong duration, jlong delay);
-    jni::Local<jni::Object<TransitionOptions>> getRasterBrightnessMinTransition(jni::JNIEnv&);
-
-    jni::Local<jni::Object<jni::ObjectTag>> getRasterBrightnessMax(jni::JNIEnv&);
-    void setRasterBrightnessMaxTransition(jni::JNIEnv&, jlong duration, jlong delay);
-    jni::Local<jni::Object<TransitionOptions>> getRasterBrightnessMaxTransition(jni::JNIEnv&);
-
-    jni::Local<jni::Object<jni::ObjectTag>> getRasterSaturation(jni::JNIEnv&);
-    void setRasterSaturationTransition(jni::JNIEnv&, jlong duration, jlong delay);
-    jni::Local<jni::Object<TransitionOptions>> getRasterSaturationTransition(jni::JNIEnv&);
-
-    jni::Local<jni::Object<jni::ObjectTag>> getRasterContrast(jni::JNIEnv&);
-    void setRasterContrastTransition(jni::JNIEnv&, jlong duration, jlong delay);
-    jni::Local<jni::Object<TransitionOptions>> getRasterContrastTransition(jni::JNIEnv&);
-
-    jni::Local<jni::Object<jni::ObjectTag>> getRasterResampling(jni::JNIEnv&);
-
-    jni::Local<jni::Object<jni::ObjectTag>> getRasterFadeDuration(jni::JNIEnv&);
-
-}; // class RasterLayer
-
-class RasterJavaLayerPeerFactory final : public JavaLayerPeerFactory,  public mbgl::RasterLayerFactory {
-public:
-    ~RasterJavaLayerPeerFactory() override;
-
-    // JavaLayerPeerFactory overrides.
-    jni::Local<jni::Object<Layer>> createJavaLayerPeer(jni::JNIEnv&, mbgl::style::Layer&) final;
-    jni::Local<jni::Object<Layer>> createJavaLayerPeer(jni::JNIEnv& env, std::unique_ptr<mbgl::style::Layer>) final;
-
-    void registerNative(jni::JNIEnv&) final;
-
-    LayerFactory* getLayerFactory() final { return this; }
-
-};  // class RasterJavaLayerPeerFactory
-
-} // namespace android
-} // namespace mbgl
diff --git a/platform/android/src/style/layers/symbol_layer.cpp b/platform/android/src/style/layers/symbol_layer.cpp
deleted file mode 100644
index f24fb35425..0000000000
--- a/platform/android/src/style/layers/symbol_layer.cpp
+++ /dev/null
@@ -1,594 +0,0 @@
-// This file is generated. Edit android/platform/scripts/generate-style-code.js, then run `make android-style-code`.
-
-#include "symbol_layer.hpp"
-
-#include <string>
-
-#include "../conversion/property_value.hpp"
-#include "../conversion/transition_options.hpp"
-
-#include <mbgl/style/layer_impl.hpp>
-
-namespace mbgl {
-namespace android {
-
-    inline mbgl::style::SymbolLayer& toSymbolLayer(mbgl::style::Layer& layer) {
-        return static_cast<mbgl::style::SymbolLayer&>(layer);
-    }
-
-    /**
-     * Creates an owning peer object (for layers not attached to the map) from the JVM side
-     */
-    SymbolLayer::SymbolLayer(jni::JNIEnv& env, jni::String& layerId, jni::String& sourceId)
-        : Layer(std::make_unique<mbgl::style::SymbolLayer>(jni::Make<std::string>(env, layerId), jni::Make<std::string>(env, sourceId))) {
-    }
-
-    /**
-     * Creates a non-owning peer object (for layers currently attached to the map)
-     */
-    SymbolLayer::SymbolLayer(mbgl::style::SymbolLayer& coreLayer) : Layer(coreLayer) {}
-
-    /**
-     * Creates an owning peer object (for layers not attached to the map)
-     */
-    SymbolLayer::SymbolLayer(std::unique_ptr<mbgl::style::SymbolLayer> coreLayer) : Layer(std::move(coreLayer)) {}
-
-    SymbolLayer::~SymbolLayer() = default;
-
-    // Property getters
-
-    jni::Local<jni::Object<>> SymbolLayer::getSymbolPlacement(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        return std::move(*convert<jni::Local<jni::Object<>>>(env, toSymbolLayer(layer).getSymbolPlacement()));
-    }
-
-    jni::Local<jni::Object<>> SymbolLayer::getSymbolSpacing(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        return std::move(*convert<jni::Local<jni::Object<>>>(env, toSymbolLayer(layer).getSymbolSpacing()));
-    }
-
-    jni::Local<jni::Object<>> SymbolLayer::getSymbolAvoidEdges(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        return std::move(*convert<jni::Local<jni::Object<>>>(env, toSymbolLayer(layer).getSymbolAvoidEdges()));
-    }
-
-    jni::Local<jni::Object<>> SymbolLayer::getSymbolSortKey(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        return std::move(*convert<jni::Local<jni::Object<>>>(env, toSymbolLayer(layer).getSymbolSortKey()));
-    }
-
-    jni::Local<jni::Object<>> SymbolLayer::getSymbolZOrder(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        return std::move(*convert<jni::Local<jni::Object<>>>(env, toSymbolLayer(layer).getSymbolZOrder()));
-    }
-
-    jni::Local<jni::Object<>> SymbolLayer::getIconAllowOverlap(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        return std::move(*convert<jni::Local<jni::Object<>>>(env, toSymbolLayer(layer).getIconAllowOverlap()));
-    }
-
-    jni::Local<jni::Object<>> SymbolLayer::getIconIgnorePlacement(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        return std::move(*convert<jni::Local<jni::Object<>>>(env, toSymbolLayer(layer).getIconIgnorePlacement()));
-    }
-
-    jni::Local<jni::Object<>> SymbolLayer::getIconOptional(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        return std::move(*convert<jni::Local<jni::Object<>>>(env, toSymbolLayer(layer).getIconOptional()));
-    }
-
-    jni::Local<jni::Object<>> SymbolLayer::getIconRotationAlignment(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        return std::move(*convert<jni::Local<jni::Object<>>>(env, toSymbolLayer(layer).getIconRotationAlignment()));
-    }
-
-    jni::Local<jni::Object<>> SymbolLayer::getIconSize(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        return std::move(*convert<jni::Local<jni::Object<>>>(env, toSymbolLayer(layer).getIconSize()));
-    }
-
-    jni::Local<jni::Object<>> SymbolLayer::getIconTextFit(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        return std::move(*convert<jni::Local<jni::Object<>>>(env, toSymbolLayer(layer).getIconTextFit()));
-    }
-
-    jni::Local<jni::Object<>> SymbolLayer::getIconTextFitPadding(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        return std::move(*convert<jni::Local<jni::Object<>>>(env, toSymbolLayer(layer).getIconTextFitPadding()));
-    }
-
-    jni::Local<jni::Object<>> SymbolLayer::getIconImage(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        return std::move(*convert<jni::Local<jni::Object<>>>(env, toSymbolLayer(layer).getIconImage()));
-    }
-
-    jni::Local<jni::Object<>> SymbolLayer::getIconRotate(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        return std::move(*convert<jni::Local<jni::Object<>>>(env, toSymbolLayer(layer).getIconRotate()));
-    }
-
-    jni::Local<jni::Object<>> SymbolLayer::getIconPadding(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        return std::move(*convert<jni::Local<jni::Object<>>>(env, toSymbolLayer(layer).getIconPadding()));
-    }
-
-    jni::Local<jni::Object<>> SymbolLayer::getIconKeepUpright(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        return std::move(*convert<jni::Local<jni::Object<>>>(env, toSymbolLayer(layer).getIconKeepUpright()));
-    }
-
-    jni::Local<jni::Object<>> SymbolLayer::getIconOffset(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        return std::move(*convert<jni::Local<jni::Object<>>>(env, toSymbolLayer(layer).getIconOffset()));
-    }
-
-    jni::Local<jni::Object<>> SymbolLayer::getIconAnchor(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        return std::move(*convert<jni::Local<jni::Object<>>>(env, toSymbolLayer(layer).getIconAnchor()));
-    }
-
-    jni::Local<jni::Object<>> SymbolLayer::getIconPitchAlignment(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        return std::move(*convert<jni::Local<jni::Object<>>>(env, toSymbolLayer(layer).getIconPitchAlignment()));
-    }
-
-    jni::Local<jni::Object<>> SymbolLayer::getTextPitchAlignment(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        return std::move(*convert<jni::Local<jni::Object<>>>(env, toSymbolLayer(layer).getTextPitchAlignment()));
-    }
-
-    jni::Local<jni::Object<>> SymbolLayer::getTextRotationAlignment(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        return std::move(*convert<jni::Local<jni::Object<>>>(env, toSymbolLayer(layer).getTextRotationAlignment()));
-    }
-
-    jni::Local<jni::Object<>> SymbolLayer::getTextField(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        return std::move(*convert<jni::Local<jni::Object<>>>(env, toSymbolLayer(layer).getTextField()));
-    }
-
-    jni::Local<jni::Object<>> SymbolLayer::getTextFont(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        return std::move(*convert<jni::Local<jni::Object<>>>(env, toSymbolLayer(layer).getTextFont()));
-    }
-
-    jni::Local<jni::Object<>> SymbolLayer::getTextSize(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        return std::move(*convert<jni::Local<jni::Object<>>>(env, toSymbolLayer(layer).getTextSize()));
-    }
-
-    jni::Local<jni::Object<>> SymbolLayer::getTextMaxWidth(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        return std::move(*convert<jni::Local<jni::Object<>>>(env, toSymbolLayer(layer).getTextMaxWidth()));
-    }
-
-    jni::Local<jni::Object<>> SymbolLayer::getTextLineHeight(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        return std::move(*convert<jni::Local<jni::Object<>>>(env, toSymbolLayer(layer).getTextLineHeight()));
-    }
-
-    jni::Local<jni::Object<>> SymbolLayer::getTextLetterSpacing(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        return std::move(*convert<jni::Local<jni::Object<>>>(env, toSymbolLayer(layer).getTextLetterSpacing()));
-    }
-
-    jni::Local<jni::Object<>> SymbolLayer::getTextJustify(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        return std::move(*convert<jni::Local<jni::Object<>>>(env, toSymbolLayer(layer).getTextJustify()));
-    }
-
-    jni::Local<jni::Object<>> SymbolLayer::getTextRadialOffset(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        return std::move(*convert<jni::Local<jni::Object<>>>(env, toSymbolLayer(layer).getTextRadialOffset()));
-    }
-
-    jni::Local<jni::Object<>> SymbolLayer::getTextVariableAnchor(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        return std::move(*convert<jni::Local<jni::Object<>>>(env, toSymbolLayer(layer).getTextVariableAnchor()));
-    }
-
-    jni::Local<jni::Object<>> SymbolLayer::getTextAnchor(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        return std::move(*convert<jni::Local<jni::Object<>>>(env, toSymbolLayer(layer).getTextAnchor()));
-    }
-
-    jni::Local<jni::Object<>> SymbolLayer::getTextMaxAngle(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        return std::move(*convert<jni::Local<jni::Object<>>>(env, toSymbolLayer(layer).getTextMaxAngle()));
-    }
-
-    jni::Local<jni::Object<>> SymbolLayer::getTextWritingMode(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        return std::move(*convert<jni::Local<jni::Object<>>>(env, toSymbolLayer(layer).getTextWritingMode()));
-    }
-
-    jni::Local<jni::Object<>> SymbolLayer::getTextRotate(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        return std::move(*convert<jni::Local<jni::Object<>>>(env, toSymbolLayer(layer).getTextRotate()));
-    }
-
-    jni::Local<jni::Object<>> SymbolLayer::getTextPadding(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        return std::move(*convert<jni::Local<jni::Object<>>>(env, toSymbolLayer(layer).getTextPadding()));
-    }
-
-    jni::Local<jni::Object<>> SymbolLayer::getTextKeepUpright(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        return std::move(*convert<jni::Local<jni::Object<>>>(env, toSymbolLayer(layer).getTextKeepUpright()));
-    }
-
-    jni::Local<jni::Object<>> SymbolLayer::getTextTransform(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        return std::move(*convert<jni::Local<jni::Object<>>>(env, toSymbolLayer(layer).getTextTransform()));
-    }
-
-    jni::Local<jni::Object<>> SymbolLayer::getTextOffset(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        return std::move(*convert<jni::Local<jni::Object<>>>(env, toSymbolLayer(layer).getTextOffset()));
-    }
-
-    jni::Local<jni::Object<>> SymbolLayer::getTextAllowOverlap(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        return std::move(*convert<jni::Local<jni::Object<>>>(env, toSymbolLayer(layer).getTextAllowOverlap()));
-    }
-
-    jni::Local<jni::Object<>> SymbolLayer::getTextIgnorePlacement(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        return std::move(*convert<jni::Local<jni::Object<>>>(env, toSymbolLayer(layer).getTextIgnorePlacement()));
-    }
-
-    jni::Local<jni::Object<>> SymbolLayer::getTextOptional(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        return std::move(*convert<jni::Local<jni::Object<>>>(env, toSymbolLayer(layer).getTextOptional()));
-    }
-
-    jni::Local<jni::Object<>> SymbolLayer::getIconOpacity(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        return std::move(*convert<jni::Local<jni::Object<>>>(env, toSymbolLayer(layer).getIconOpacity()));
-    }
-
-    jni::Local<jni::Object<TransitionOptions>> SymbolLayer::getIconOpacityTransition(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        mbgl::style::TransitionOptions options = toSymbolLayer(layer).getIconOpacityTransition();
-        return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, options));
-    }
-
-    void SymbolLayer::setIconOpacityTransition(jni::JNIEnv&, jlong duration, jlong delay) {
-        mbgl::style::TransitionOptions options;
-        options.duration.emplace(mbgl::Milliseconds(duration));
-        options.delay.emplace(mbgl::Milliseconds(delay));
-        toSymbolLayer(layer).setIconOpacityTransition(options);
-    }
-
-    jni::Local<jni::Object<>> SymbolLayer::getIconColor(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        return std::move(*convert<jni::Local<jni::Object<>>>(env, toSymbolLayer(layer).getIconColor()));
-    }
-
-    jni::Local<jni::Object<TransitionOptions>> SymbolLayer::getIconColorTransition(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        mbgl::style::TransitionOptions options = toSymbolLayer(layer).getIconColorTransition();
-        return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, options));
-    }
-
-    void SymbolLayer::setIconColorTransition(jni::JNIEnv&, jlong duration, jlong delay) {
-        mbgl::style::TransitionOptions options;
-        options.duration.emplace(mbgl::Milliseconds(duration));
-        options.delay.emplace(mbgl::Milliseconds(delay));
-        toSymbolLayer(layer).setIconColorTransition(options);
-    }
-
-    jni::Local<jni::Object<>> SymbolLayer::getIconHaloColor(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        return std::move(*convert<jni::Local<jni::Object<>>>(env, toSymbolLayer(layer).getIconHaloColor()));
-    }
-
-    jni::Local<jni::Object<TransitionOptions>> SymbolLayer::getIconHaloColorTransition(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        mbgl::style::TransitionOptions options = toSymbolLayer(layer).getIconHaloColorTransition();
-        return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, options));
-    }
-
-    void SymbolLayer::setIconHaloColorTransition(jni::JNIEnv&, jlong duration, jlong delay) {
-        mbgl::style::TransitionOptions options;
-        options.duration.emplace(mbgl::Milliseconds(duration));
-        options.delay.emplace(mbgl::Milliseconds(delay));
-        toSymbolLayer(layer).setIconHaloColorTransition(options);
-    }
-
-    jni::Local<jni::Object<>> SymbolLayer::getIconHaloWidth(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        return std::move(*convert<jni::Local<jni::Object<>>>(env, toSymbolLayer(layer).getIconHaloWidth()));
-    }
-
-    jni::Local<jni::Object<TransitionOptions>> SymbolLayer::getIconHaloWidthTransition(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        mbgl::style::TransitionOptions options = toSymbolLayer(layer).getIconHaloWidthTransition();
-        return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, options));
-    }
-
-    void SymbolLayer::setIconHaloWidthTransition(jni::JNIEnv&, jlong duration, jlong delay) {
-        mbgl::style::TransitionOptions options;
-        options.duration.emplace(mbgl::Milliseconds(duration));
-        options.delay.emplace(mbgl::Milliseconds(delay));
-        toSymbolLayer(layer).setIconHaloWidthTransition(options);
-    }
-
-    jni::Local<jni::Object<>> SymbolLayer::getIconHaloBlur(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        return std::move(*convert<jni::Local<jni::Object<>>>(env, toSymbolLayer(layer).getIconHaloBlur()));
-    }
-
-    jni::Local<jni::Object<TransitionOptions>> SymbolLayer::getIconHaloBlurTransition(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        mbgl::style::TransitionOptions options = toSymbolLayer(layer).getIconHaloBlurTransition();
-        return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, options));
-    }
-
-    void SymbolLayer::setIconHaloBlurTransition(jni::JNIEnv&, jlong duration, jlong delay) {
-        mbgl::style::TransitionOptions options;
-        options.duration.emplace(mbgl::Milliseconds(duration));
-        options.delay.emplace(mbgl::Milliseconds(delay));
-        toSymbolLayer(layer).setIconHaloBlurTransition(options);
-    }
-
-    jni::Local<jni::Object<>> SymbolLayer::getIconTranslate(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        return std::move(*convert<jni::Local<jni::Object<>>>(env, toSymbolLayer(layer).getIconTranslate()));
-    }
-
-    jni::Local<jni::Object<TransitionOptions>> SymbolLayer::getIconTranslateTransition(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        mbgl::style::TransitionOptions options = toSymbolLayer(layer).getIconTranslateTransition();
-        return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, options));
-    }
-
-    void SymbolLayer::setIconTranslateTransition(jni::JNIEnv&, jlong duration, jlong delay) {
-        mbgl::style::TransitionOptions options;
-        options.duration.emplace(mbgl::Milliseconds(duration));
-        options.delay.emplace(mbgl::Milliseconds(delay));
-        toSymbolLayer(layer).setIconTranslateTransition(options);
-    }
-
-    jni::Local<jni::Object<>> SymbolLayer::getIconTranslateAnchor(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        return std::move(*convert<jni::Local<jni::Object<>>>(env, toSymbolLayer(layer).getIconTranslateAnchor()));
-    }
-
-    jni::Local<jni::Object<>> SymbolLayer::getTextOpacity(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        return std::move(*convert<jni::Local<jni::Object<>>>(env, toSymbolLayer(layer).getTextOpacity()));
-    }
-
-    jni::Local<jni::Object<TransitionOptions>> SymbolLayer::getTextOpacityTransition(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        mbgl::style::TransitionOptions options = toSymbolLayer(layer).getTextOpacityTransition();
-        return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, options));
-    }
-
-    void SymbolLayer::setTextOpacityTransition(jni::JNIEnv&, jlong duration, jlong delay) {
-        mbgl::style::TransitionOptions options;
-        options.duration.emplace(mbgl::Milliseconds(duration));
-        options.delay.emplace(mbgl::Milliseconds(delay));
-        toSymbolLayer(layer).setTextOpacityTransition(options);
-    }
-
-    jni::Local<jni::Object<>> SymbolLayer::getTextColor(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        return std::move(*convert<jni::Local<jni::Object<>>>(env, toSymbolLayer(layer).getTextColor()));
-    }
-
-    jni::Local<jni::Object<TransitionOptions>> SymbolLayer::getTextColorTransition(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        mbgl::style::TransitionOptions options = toSymbolLayer(layer).getTextColorTransition();
-        return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, options));
-    }
-
-    void SymbolLayer::setTextColorTransition(jni::JNIEnv&, jlong duration, jlong delay) {
-        mbgl::style::TransitionOptions options;
-        options.duration.emplace(mbgl::Milliseconds(duration));
-        options.delay.emplace(mbgl::Milliseconds(delay));
-        toSymbolLayer(layer).setTextColorTransition(options);
-    }
-
-    jni::Local<jni::Object<>> SymbolLayer::getTextHaloColor(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        return std::move(*convert<jni::Local<jni::Object<>>>(env, toSymbolLayer(layer).getTextHaloColor()));
-    }
-
-    jni::Local<jni::Object<TransitionOptions>> SymbolLayer::getTextHaloColorTransition(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        mbgl::style::TransitionOptions options = toSymbolLayer(layer).getTextHaloColorTransition();
-        return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, options));
-    }
-
-    void SymbolLayer::setTextHaloColorTransition(jni::JNIEnv&, jlong duration, jlong delay) {
-        mbgl::style::TransitionOptions options;
-        options.duration.emplace(mbgl::Milliseconds(duration));
-        options.delay.emplace(mbgl::Milliseconds(delay));
-        toSymbolLayer(layer).setTextHaloColorTransition(options);
-    }
-
-    jni::Local<jni::Object<>> SymbolLayer::getTextHaloWidth(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        return std::move(*convert<jni::Local<jni::Object<>>>(env, toSymbolLayer(layer).getTextHaloWidth()));
-    }
-
-    jni::Local<jni::Object<TransitionOptions>> SymbolLayer::getTextHaloWidthTransition(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        mbgl::style::TransitionOptions options = toSymbolLayer(layer).getTextHaloWidthTransition();
-        return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, options));
-    }
-
-    void SymbolLayer::setTextHaloWidthTransition(jni::JNIEnv&, jlong duration, jlong delay) {
-        mbgl::style::TransitionOptions options;
-        options.duration.emplace(mbgl::Milliseconds(duration));
-        options.delay.emplace(mbgl::Milliseconds(delay));
-        toSymbolLayer(layer).setTextHaloWidthTransition(options);
-    }
-
-    jni::Local<jni::Object<>> SymbolLayer::getTextHaloBlur(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        return std::move(*convert<jni::Local<jni::Object<>>>(env, toSymbolLayer(layer).getTextHaloBlur()));
-    }
-
-    jni::Local<jni::Object<TransitionOptions>> SymbolLayer::getTextHaloBlurTransition(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        mbgl::style::TransitionOptions options = toSymbolLayer(layer).getTextHaloBlurTransition();
-        return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, options));
-    }
-
-    void SymbolLayer::setTextHaloBlurTransition(jni::JNIEnv&, jlong duration, jlong delay) {
-        mbgl::style::TransitionOptions options;
-        options.duration.emplace(mbgl::Milliseconds(duration));
-        options.delay.emplace(mbgl::Milliseconds(delay));
-        toSymbolLayer(layer).setTextHaloBlurTransition(options);
-    }
-
-    jni::Local<jni::Object<>> SymbolLayer::getTextTranslate(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        return std::move(*convert<jni::Local<jni::Object<>>>(env, toSymbolLayer(layer).getTextTranslate()));
-    }
-
-    jni::Local<jni::Object<TransitionOptions>> SymbolLayer::getTextTranslateTransition(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        mbgl::style::TransitionOptions options = toSymbolLayer(layer).getTextTranslateTransition();
-        return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, options));
-    }
-
-    void SymbolLayer::setTextTranslateTransition(jni::JNIEnv&, jlong duration, jlong delay) {
-        mbgl::style::TransitionOptions options;
-        options.duration.emplace(mbgl::Milliseconds(duration));
-        options.delay.emplace(mbgl::Milliseconds(delay));
-        toSymbolLayer(layer).setTextTranslateTransition(options);
-    }
-
-    jni::Local<jni::Object<>> SymbolLayer::getTextTranslateAnchor(jni::JNIEnv& env) {
-        using namespace mbgl::android::conversion;
-        return std::move(*convert<jni::Local<jni::Object<>>>(env, toSymbolLayer(layer).getTextTranslateAnchor()));
-    }
-
-
-    // SymbolJavaLayerPeerFactory
-
-    SymbolJavaLayerPeerFactory::~SymbolJavaLayerPeerFactory() = default;
-
-    namespace {
-        jni::Local<jni::Object<Layer>> createJavaPeer(jni::JNIEnv& env, Layer* layer) {
-            static auto& javaClass = jni::Class<SymbolLayer>::Singleton(env);
-            static auto constructor = javaClass.GetConstructor<jni::jlong>(env);
-            return javaClass.New(env, constructor, reinterpret_cast<jni::jlong>(layer));
-        }
-    }  // namespace
-
-    jni::Local<jni::Object<Layer>> SymbolJavaLayerPeerFactory::createJavaLayerPeer(jni::JNIEnv& env,
-                                                                                   mbgl::style::Layer& layer) {
-        assert(layer.baseImpl->getTypeInfo() == getTypeInfo());
-        return createJavaPeer(env, new SymbolLayer(toSymbolLayer(layer)));
-    }
-
-    jni::Local<jni::Object<Layer>> SymbolJavaLayerPeerFactory::createJavaLayerPeer(
-        jni::JNIEnv& env, std::unique_ptr<mbgl::style::Layer> layer) {
-        assert(layer->baseImpl->getTypeInfo() == getTypeInfo());
-        return createJavaPeer(env,
-                              new SymbolLayer(std::unique_ptr<mbgl::style::SymbolLayer>(
-                                  static_cast<mbgl::style::SymbolLayer*>(layer.release()))));
-    }
-
-    void SymbolJavaLayerPeerFactory::registerNative(jni::JNIEnv& env) {
-        // Lookup the class
-        static auto& javaClass = jni::Class<SymbolLayer>::Singleton(env);
-
-        #define METHOD(MethodPtr, name) jni::MakeNativePeerMethod<decltype(MethodPtr), (MethodPtr)>(name)
-
-        // Register the peer
-        jni::RegisterNativePeer<SymbolLayer>(
-            env,
-            javaClass,
-            "nativePtr",
-            jni::MakePeer<SymbolLayer, jni::String&, jni::String&>,
-            "initialize",
-            "finalize",
-            METHOD(&SymbolLayer::getSymbolPlacement, "nativeGetSymbolPlacement"),
-            METHOD(&SymbolLayer::getSymbolSpacing, "nativeGetSymbolSpacing"),
-            METHOD(&SymbolLayer::getSymbolAvoidEdges, "nativeGetSymbolAvoidEdges"),
-            METHOD(&SymbolLayer::getSymbolSortKey, "nativeGetSymbolSortKey"),
-            METHOD(&SymbolLayer::getSymbolZOrder, "nativeGetSymbolZOrder"),
-            METHOD(&SymbolLayer::getIconAllowOverlap, "nativeGetIconAllowOverlap"),
-            METHOD(&SymbolLayer::getIconIgnorePlacement, "nativeGetIconIgnorePlacement"),
-            METHOD(&SymbolLayer::getIconOptional, "nativeGetIconOptional"),
-            METHOD(&SymbolLayer::getIconRotationAlignment, "nativeGetIconRotationAlignment"),
-            METHOD(&SymbolLayer::getIconSize, "nativeGetIconSize"),
-            METHOD(&SymbolLayer::getIconTextFit, "nativeGetIconTextFit"),
-            METHOD(&SymbolLayer::getIconTextFitPadding, "nativeGetIconTextFitPadding"),
-            METHOD(&SymbolLayer::getIconImage, "nativeGetIconImage"),
-            METHOD(&SymbolLayer::getIconRotate, "nativeGetIconRotate"),
-            METHOD(&SymbolLayer::getIconPadding, "nativeGetIconPadding"),
-            METHOD(&SymbolLayer::getIconKeepUpright, "nativeGetIconKeepUpright"),
-            METHOD(&SymbolLayer::getIconOffset, "nativeGetIconOffset"),
-            METHOD(&SymbolLayer::getIconAnchor, "nativeGetIconAnchor"),
-            METHOD(&SymbolLayer::getIconPitchAlignment, "nativeGetIconPitchAlignment"),
-            METHOD(&SymbolLayer::getTextPitchAlignment, "nativeGetTextPitchAlignment"),
-            METHOD(&SymbolLayer::getTextRotationAlignment, "nativeGetTextRotationAlignment"),
-            METHOD(&SymbolLayer::getTextField, "nativeGetTextField"),
-            METHOD(&SymbolLayer::getTextFont, "nativeGetTextFont"),
-            METHOD(&SymbolLayer::getTextSize, "nativeGetTextSize"),
-            METHOD(&SymbolLayer::getTextMaxWidth, "nativeGetTextMaxWidth"),
-            METHOD(&SymbolLayer::getTextLineHeight, "nativeGetTextLineHeight"),
-            METHOD(&SymbolLayer::getTextLetterSpacing, "nativeGetTextLetterSpacing"),
-            METHOD(&SymbolLayer::getTextJustify, "nativeGetTextJustify"),
-            METHOD(&SymbolLayer::getTextRadialOffset, "nativeGetTextRadialOffset"),
-            METHOD(&SymbolLayer::getTextVariableAnchor, "nativeGetTextVariableAnchor"),
-            METHOD(&SymbolLayer::getTextAnchor, "nativeGetTextAnchor"),
-            METHOD(&SymbolLayer::getTextMaxAngle, "nativeGetTextMaxAngle"),
-            METHOD(&SymbolLayer::getTextWritingMode, "nativeGetTextWritingMode"),
-            METHOD(&SymbolLayer::getTextRotate, "nativeGetTextRotate"),
-            METHOD(&SymbolLayer::getTextPadding, "nativeGetTextPadding"),
-            METHOD(&SymbolLayer::getTextKeepUpright, "nativeGetTextKeepUpright"),
-            METHOD(&SymbolLayer::getTextTransform, "nativeGetTextTransform"),
-            METHOD(&SymbolLayer::getTextOffset, "nativeGetTextOffset"),
-            METHOD(&SymbolLayer::getTextAllowOverlap, "nativeGetTextAllowOverlap"),
-            METHOD(&SymbolLayer::getTextIgnorePlacement, "nativeGetTextIgnorePlacement"),
-            METHOD(&SymbolLayer::getTextOptional, "nativeGetTextOptional"),
-            METHOD(&SymbolLayer::getIconOpacityTransition, "nativeGetIconOpacityTransition"),
-            METHOD(&SymbolLayer::setIconOpacityTransition, "nativeSetIconOpacityTransition"),
-            METHOD(&SymbolLayer::getIconOpacity, "nativeGetIconOpacity"),
-            METHOD(&SymbolLayer::getIconColorTransition, "nativeGetIconColorTransition"),
-            METHOD(&SymbolLayer::setIconColorTransition, "nativeSetIconColorTransition"),
-            METHOD(&SymbolLayer::getIconColor, "nativeGetIconColor"),
-            METHOD(&SymbolLayer::getIconHaloColorTransition, "nativeGetIconHaloColorTransition"),
-            METHOD(&SymbolLayer::setIconHaloColorTransition, "nativeSetIconHaloColorTransition"),
-            METHOD(&SymbolLayer::getIconHaloColor, "nativeGetIconHaloColor"),
-            METHOD(&SymbolLayer::getIconHaloWidthTransition, "nativeGetIconHaloWidthTransition"),
-            METHOD(&SymbolLayer::setIconHaloWidthTransition, "nativeSetIconHaloWidthTransition"),
-            METHOD(&SymbolLayer::getIconHaloWidth, "nativeGetIconHaloWidth"),
-            METHOD(&SymbolLayer::getIconHaloBlurTransition, "nativeGetIconHaloBlurTransition"),
-            METHOD(&SymbolLayer::setIconHaloBlurTransition, "nativeSetIconHaloBlurTransition"),
-            METHOD(&SymbolLayer::getIconHaloBlur, "nativeGetIconHaloBlur"),
-            METHOD(&SymbolLayer::getIconTranslateTransition, "nativeGetIconTranslateTransition"),
-            METHOD(&SymbolLayer::setIconTranslateTransition, "nativeSetIconTranslateTransition"),
-            METHOD(&SymbolLayer::getIconTranslate, "nativeGetIconTranslate"),
-            METHOD(&SymbolLayer::getIconTranslateAnchor, "nativeGetIconTranslateAnchor"),
-            METHOD(&SymbolLayer::getTextOpacityTransition, "nativeGetTextOpacityTransition"),
-            METHOD(&SymbolLayer::setTextOpacityTransition, "nativeSetTextOpacityTransition"),
-            METHOD(&SymbolLayer::getTextOpacity, "nativeGetTextOpacity"),
-            METHOD(&SymbolLayer::getTextColorTransition, "nativeGetTextColorTransition"),
-            METHOD(&SymbolLayer::setTextColorTransition, "nativeSetTextColorTransition"),
-            METHOD(&SymbolLayer::getTextColor, "nativeGetTextColor"),
-            METHOD(&SymbolLayer::getTextHaloColorTransition, "nativeGetTextHaloColorTransition"),
-            METHOD(&SymbolLayer::setTextHaloColorTransition, "nativeSetTextHaloColorTransition"),
-            METHOD(&SymbolLayer::getTextHaloColor, "nativeGetTextHaloColor"),
-            METHOD(&SymbolLayer::getTextHaloWidthTransition, "nativeGetTextHaloWidthTransition"),
-            METHOD(&SymbolLayer::setTextHaloWidthTransition, "nativeSetTextHaloWidthTransition"),
-            METHOD(&SymbolLayer::getTextHaloWidth, "nativeGetTextHaloWidth"),
-            METHOD(&SymbolLayer::getTextHaloBlurTransition, "nativeGetTextHaloBlurTransition"),
-            METHOD(&SymbolLayer::setTextHaloBlurTransition, "nativeSetTextHaloBlurTransition"),
-            METHOD(&SymbolLayer::getTextHaloBlur, "nativeGetTextHaloBlur"),
-            METHOD(&SymbolLayer::getTextTranslateTransition, "nativeGetTextTranslateTransition"),
-            METHOD(&SymbolLayer::setTextTranslateTransition, "nativeSetTextTranslateTransition"),
-            METHOD(&SymbolLayer::getTextTranslate, "nativeGetTextTranslate"),
-            METHOD(&SymbolLayer::getTextTranslateAnchor, "nativeGetTextTranslateAnchor"));
-    }
-
-} // namespace android
-} // namespace mbgl
diff --git a/platform/android/src/style/layers/symbol_layer.hpp b/platform/android/src/style/layers/symbol_layer.hpp
deleted file mode 100644
index 4898c830df..0000000000
--- a/platform/android/src/style/layers/symbol_layer.hpp
+++ /dev/null
@@ -1,180 +0,0 @@
-// This file is generated. Edit android/platform/scripts/generate-style-code.js, then run `make android-style-code`.
-
-#pragma once
-
-#include "layer.hpp"
-#include "../transition_options.hpp"
-#include <mbgl/layermanager/symbol_layer_factory.hpp>
-#include <mbgl/style/layers/symbol_layer.hpp>
-#include <jni/jni.hpp>
-
-namespace mbgl {
-namespace android {
-
-class SymbolLayer : public Layer {
-public:
-    using SuperTag = Layer;
-    static constexpr auto Name() { return "com/mapbox/mapboxsdk/style/layers/SymbolLayer"; };
-
-    SymbolLayer(jni::JNIEnv&, jni::String&, jni::String&);
-
-    SymbolLayer(mbgl::style::SymbolLayer&);
-
-    SymbolLayer(std::unique_ptr<mbgl::style::SymbolLayer>);
-
-    ~SymbolLayer();
-
-    // Properties
-
-    jni::Local<jni::Object<jni::ObjectTag>> getSymbolPlacement(jni::JNIEnv&);
-
-    jni::Local<jni::Object<jni::ObjectTag>> getSymbolSpacing(jni::JNIEnv&);
-
-    jni::Local<jni::Object<jni::ObjectTag>> getSymbolAvoidEdges(jni::JNIEnv&);
-
-    jni::Local<jni::Object<jni::ObjectTag>> getSymbolSortKey(jni::JNIEnv&);
-
-    jni::Local<jni::Object<jni::ObjectTag>> getSymbolZOrder(jni::JNIEnv&);
-
-    jni::Local<jni::Object<jni::ObjectTag>> getIconAllowOverlap(jni::JNIEnv&);
-
-    jni::Local<jni::Object<jni::ObjectTag>> getIconIgnorePlacement(jni::JNIEnv&);
-
-    jni::Local<jni::Object<jni::ObjectTag>> getIconOptional(jni::JNIEnv&);
-
-    jni::Local<jni::Object<jni::ObjectTag>> getIconRotationAlignment(jni::JNIEnv&);
-
-    jni::Local<jni::Object<jni::ObjectTag>> getIconSize(jni::JNIEnv&);
-
-    jni::Local<jni::Object<jni::ObjectTag>> getIconTextFit(jni::JNIEnv&);
-
-    jni::Local<jni::Object<jni::ObjectTag>> getIconTextFitPadding(jni::JNIEnv&);
-
-    jni::Local<jni::Object<jni::ObjectTag>> getIconImage(jni::JNIEnv&);
-
-    jni::Local<jni::Object<jni::ObjectTag>> getIconRotate(jni::JNIEnv&);
-
-    jni::Local<jni::Object<jni::ObjectTag>> getIconPadding(jni::JNIEnv&);
-
-    jni::Local<jni::Object<jni::ObjectTag>> getIconKeepUpright(jni::JNIEnv&);
-
-    jni::Local<jni::Object<jni::ObjectTag>> getIconOffset(jni::JNIEnv&);
-
-    jni::Local<jni::Object<jni::ObjectTag>> getIconAnchor(jni::JNIEnv&);
-
-    jni::Local<jni::Object<jni::ObjectTag>> getIconPitchAlignment(jni::JNIEnv&);
-
-    jni::Local<jni::Object<jni::ObjectTag>> getTextPitchAlignment(jni::JNIEnv&);
-
-    jni::Local<jni::Object<jni::ObjectTag>> getTextRotationAlignment(jni::JNIEnv&);
-
-    jni::Local<jni::Object<jni::ObjectTag>> getTextField(jni::JNIEnv&);
-
-    jni::Local<jni::Object<jni::ObjectTag>> getTextFont(jni::JNIEnv&);
-
-    jni::Local<jni::Object<jni::ObjectTag>> getTextSize(jni::JNIEnv&);
-
-    jni::Local<jni::Object<jni::ObjectTag>> getTextMaxWidth(jni::JNIEnv&);
-
-    jni::Local<jni::Object<jni::ObjectTag>> getTextLineHeight(jni::JNIEnv&);
-
-    jni::Local<jni::Object<jni::ObjectTag>> getTextLetterSpacing(jni::JNIEnv&);
-
-    jni::Local<jni::Object<jni::ObjectTag>> getTextJustify(jni::JNIEnv&);
-
-    jni::Local<jni::Object<jni::ObjectTag>> getTextRadialOffset(jni::JNIEnv&);
-
-    jni::Local<jni::Object<jni::ObjectTag>> getTextVariableAnchor(jni::JNIEnv&);
-
-    jni::Local<jni::Object<jni::ObjectTag>> getTextAnchor(jni::JNIEnv&);
-
-    jni::Local<jni::Object<jni::ObjectTag>> getTextMaxAngle(jni::JNIEnv&);
-
-    jni::Local<jni::Object<jni::ObjectTag>> getTextWritingMode(jni::JNIEnv&);
-
-    jni::Local<jni::Object<jni::ObjectTag>> getTextRotate(jni::JNIEnv&);
-
-    jni::Local<jni::Object<jni::ObjectTag>> getTextPadding(jni::JNIEnv&);
-
-    jni::Local<jni::Object<jni::ObjectTag>> getTextKeepUpright(jni::JNIEnv&);
-
-    jni::Local<jni::Object<jni::ObjectTag>> getTextTransform(jni::JNIEnv&);
-
-    jni::Local<jni::Object<jni::ObjectTag>> getTextOffset(jni::JNIEnv&);
-
-    jni::Local<jni::Object<jni::ObjectTag>> getTextAllowOverlap(jni::JNIEnv&);
-
-    jni::Local<jni::Object<jni::ObjectTag>> getTextIgnorePlacement(jni::JNIEnv&);
-
-    jni::Local<jni::Object<jni::ObjectTag>> getTextOptional(jni::JNIEnv&);
-
-    jni::Local<jni::Object<jni::ObjectTag>> getIconOpacity(jni::JNIEnv&);
-    void setIconOpacityTransition(jni::JNIEnv&, jlong duration, jlong delay);
-    jni::Local<jni::Object<TransitionOptions>> getIconOpacityTransition(jni::JNIEnv&);
-
-    jni::Local<jni::Object<jni::ObjectTag>> getIconColor(jni::JNIEnv&);
-    void setIconColorTransition(jni::JNIEnv&, jlong duration, jlong delay);
-    jni::Local<jni::Object<TransitionOptions>> getIconColorTransition(jni::JNIEnv&);
-
-    jni::Local<jni::Object<jni::ObjectTag>> getIconHaloColor(jni::JNIEnv&);
-    void setIconHaloColorTransition(jni::JNIEnv&, jlong duration, jlong delay);
-    jni::Local<jni::Object<TransitionOptions>> getIconHaloColorTransition(jni::JNIEnv&);
-
-    jni::Local<jni::Object<jni::ObjectTag>> getIconHaloWidth(jni::JNIEnv&);
-    void setIconHaloWidthTransition(jni::JNIEnv&, jlong duration, jlong delay);
-    jni::Local<jni::Object<TransitionOptions>> getIconHaloWidthTransition(jni::JNIEnv&);
-
-    jni::Local<jni::Object<jni::ObjectTag>> getIconHaloBlur(jni::JNIEnv&);
-    void setIconHaloBlurTransition(jni::JNIEnv&, jlong duration, jlong delay);
-    jni::Local<jni::Object<TransitionOptions>> getIconHaloBlurTransition(jni::JNIEnv&);
-
-    jni::Local<jni::Object<jni::ObjectTag>> getIconTranslate(jni::JNIEnv&);
-    void setIconTranslateTransition(jni::JNIEnv&, jlong duration, jlong delay);
-    jni::Local<jni::Object<TransitionOptions>> getIconTranslateTransition(jni::JNIEnv&);
-
-    jni::Local<jni::Object<jni::ObjectTag>> getIconTranslateAnchor(jni::JNIEnv&);
-
-    jni::Local<jni::Object<jni::ObjectTag>> getTextOpacity(jni::JNIEnv&);
-    void setTextOpacityTransition(jni::JNIEnv&, jlong duration, jlong delay);
-    jni::Local<jni::Object<TransitionOptions>> getTextOpacityTransition(jni::JNIEnv&);
-
-    jni::Local<jni::Object<jni::ObjectTag>> getTextColor(jni::JNIEnv&);
-    void setTextColorTransition(jni::JNIEnv&, jlong duration, jlong delay);
-    jni::Local<jni::Object<TransitionOptions>> getTextColorTransition(jni::JNIEnv&);
-
-    jni::Local<jni::Object<jni::ObjectTag>> getTextHaloColor(jni::JNIEnv&);
-    void setTextHaloColorTransition(jni::JNIEnv&, jlong duration, jlong delay);
-    jni::Local<jni::Object<TransitionOptions>> getTextHaloColorTransition(jni::JNIEnv&);
-
-    jni::Local<jni::Object<jni::ObjectTag>> getTextHaloWidth(jni::JNIEnv&);
-    void setTextHaloWidthTransition(jni::JNIEnv&, jlong duration, jlong delay);
-    jni::Local<jni::Object<TransitionOptions>> getTextHaloWidthTransition(jni::JNIEnv&);
-
-    jni::Local<jni::Object<jni::ObjectTag>> getTextHaloBlur(jni::JNIEnv&);
-    void setTextHaloBlurTransition(jni::JNIEnv&, jlong duration, jlong delay);
-    jni::Local<jni::Object<TransitionOptions>> getTextHaloBlurTransition(jni::JNIEnv&);
-
-    jni::Local<jni::Object<jni::ObjectTag>> getTextTranslate(jni::JNIEnv&);
-    void setTextTranslateTransition(jni::JNIEnv&, jlong duration, jlong delay);
-    jni::Local<jni::Object<TransitionOptions>> getTextTranslateTransition(jni::JNIEnv&);
-
-    jni::Local<jni::Object<jni::ObjectTag>> getTextTranslateAnchor(jni::JNIEnv&);
-
-}; // class SymbolLayer
-
-class SymbolJavaLayerPeerFactory final : public JavaLayerPeerFactory,  public mbgl::SymbolLayerFactory {
-public:
-    ~SymbolJavaLayerPeerFactory() override;
-
-    // JavaLayerPeerFactory overrides.
-    jni::Local<jni::Object<Layer>> createJavaLayerPeer(jni::JNIEnv&, mbgl::style::Layer&) final;
-    jni::Local<jni::Object<Layer>> createJavaLayerPeer(jni::JNIEnv& env, std::unique_ptr<mbgl::style::Layer>) final;
-
-    void registerNative(jni::JNIEnv&) final;
-
-    LayerFactory* getLayerFactory() final { return this; }
-
-};  // class SymbolJavaLayerPeerFactory
-
-} // namespace android
-} // namespace mbgl
diff --git a/platform/android/src/style/light.cpp b/platform/android/src/style/light.cpp
deleted file mode 100644
index d8ed4d9d96..0000000000
--- a/platform/android/src/style/light.cpp
+++ /dev/null
@@ -1,143 +0,0 @@
-#include <mbgl/map/map.hpp>
-#include "light.hpp"
-#include "conversion/transition_options.hpp"
-#include "conversion/position.hpp"
-
-namespace mbgl {
-namespace android {
-
-Light::Light(mbgl::Map& coreMap, mbgl::style::Light& coreLight)
-    : light(coreLight) , map(&coreMap) {
-}
-
-static Light* initializeLightPeer(mbgl::Map& map, mbgl::style::Light& coreLight) {
-    return new Light(map, coreLight);
-}
-
-jni::Local<jni::Object<Light>> Light::createJavaLightPeer(jni::JNIEnv& env, Map& map, mbgl::style::Light& coreLight) {
-    std::unique_ptr<Light> peerLight = std::unique_ptr<Light>(initializeLightPeer(map, coreLight));
-    auto result = peerLight->createJavaPeer(env);
-    peerLight.release();
-    return result;
-}
-
-jni::Local<jni::Object<Light>> Light::createJavaPeer(jni::JNIEnv& env) {
-    static auto& javaClass = jni::Class<Light>::Singleton(env);
-    static auto constructor = javaClass.GetConstructor<jni::jlong>(env);
-    return javaClass.New(env, constructor, reinterpret_cast<jni::jlong>(this));
-}
-
-void Light::setAnchor(jni::JNIEnv& env, const jni::String& property) {
-    std::string anchorStr = jni::Make<std::string>(env, property);
-    if (anchorStr.compare("map") == 0) {
-        light.setAnchor(LightAnchorType::Map);
-    } else if (anchorStr.compare("viewport") == 0) {
-        light.setAnchor(LightAnchorType::Viewport);
-    }
-}
-
-jni::Local<jni::String> Light::getAnchor(jni::JNIEnv& env) {
-    auto anchorType = light.getAnchor();
-    if (anchorType == LightAnchorType::Map) {
-        return jni::Make<jni::String>(env, "map");
-    } else {
-        return jni::Make<jni::String>(env, "viewport");
-    }
-}
-
-void Light::setPosition(jni::JNIEnv& env, const jni::Object<Position>& jposition) {
-    using namespace mbgl::android::conversion;
-    auto position = *convert<mbgl::style::Position>(env, jposition);
-    light.setPosition(position);
-}
-
-jni::Local<jni::Object<Position>> Light::getPosition(jni::JNIEnv& env) {
-    using namespace mbgl::android::conversion;
-    mbgl::style::Position position = light.getPosition().asConstant();
-    return std::move(*convert<jni::Local<jni::Object<Position>>>(env, position));
-}
-
-jni::Local<jni::Object<TransitionOptions>> Light::getPositionTransition(jni::JNIEnv& env) {
-   using namespace mbgl::android::conversion;
-   mbgl::style::TransitionOptions options = light.getPositionTransition();
-   return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, options));
-}
-
-void Light::setPositionTransition(jni::JNIEnv&, jlong duration, jlong delay) {
-   mbgl::style::TransitionOptions options;
-   options.duration.emplace(mbgl::Milliseconds(duration));
-   options.delay.emplace(mbgl::Milliseconds(delay));
-   light.setPositionTransition(options);
-}
-
-void Light::setColor(jni::JNIEnv& env, const jni::String& property) {
-    auto color = Color::parse(jni::Make<std::string>(env, property));
-    if (color) {
-        light.setColor(color.value());
-    }
-}
-
-jni::Local<jni::String> Light::getColor(jni::JNIEnv &env) {
-    auto color = light.getColor().asConstant();
-    return jni::Make<jni::String>(env, color.stringify());
-}
-
-jni::Local<jni::Object<TransitionOptions>> Light::getColorTransition(jni::JNIEnv& env) {
-   using namespace mbgl::android::conversion;
-   mbgl::style::TransitionOptions options = light.getColorTransition();
-   return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, options));
-}
-
-void Light::setColorTransition(jni::JNIEnv&, jlong duration, jlong delay) {
-   mbgl::style::TransitionOptions options;
-   options.duration.emplace(mbgl::Milliseconds(duration));
-   options.delay.emplace(mbgl::Milliseconds(delay));
-   light.setColorTransition(options);
-}
-
-void Light::setIntensity(jni::JNIEnv&, jni::jfloat property) {
-    light.setIntensity(property);
-}
-
-jni::jfloat Light::getIntensity(jni::JNIEnv&) {
-    return light.getIntensity().asConstant();
-}
-
-jni::Local<jni::Object<TransitionOptions>> Light::getIntensityTransition(jni::JNIEnv& env) {
-   using namespace mbgl::android::conversion;
-   mbgl::style::TransitionOptions options = light.getIntensityTransition();
-   return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, options));
-}
-
-void Light::setIntensityTransition(jni::JNIEnv&, jlong duration, jlong delay) {
-   mbgl::style::TransitionOptions options;
-   options.duration.emplace(mbgl::Milliseconds(duration));
-   options.delay.emplace(mbgl::Milliseconds(delay));
-   light.setIntensityTransition(options);
-}
-
-void Light::registerNative(jni::JNIEnv& env) {
-    // Lookup the class
-    static auto& javaClass = jni::Class<Light>::Singleton(env);
-
-#define METHOD(MethodPtr, name) jni::MakeNativePeerMethod<decltype(MethodPtr), (MethodPtr)>(name)
-    // Register the peer
-    jni::RegisterNativePeer<Light>(env, javaClass, "nativePtr",
-    METHOD(&Light::getAnchor, "nativeGetAnchor"),
-    METHOD(&Light::setAnchor, "nativeSetAnchor"),
-    METHOD(&Light::getPositionTransition, "nativeGetPositionTransition"),
-    METHOD(&Light::setPositionTransition, "nativeSetPositionTransition"),
-    METHOD(&Light::getPosition, "nativeGetPosition"),
-    METHOD(&Light::setPosition, "nativeSetPosition"),
-    METHOD(&Light::getColorTransition, "nativeGetColorTransition"),
-    METHOD(&Light::setColorTransition, "nativeSetColorTransition"),
-    METHOD(&Light::getColor, "nativeGetColor"),
-    METHOD(&Light::setColor, "nativeSetColor"),
-    METHOD(&Light::getIntensityTransition, "nativeGetIntensityTransition"),
-    METHOD(&Light::setIntensityTransition, "nativeSetIntensityTransition"),
-    METHOD(&Light::getIntensity, "nativeGetIntensity"),
-    METHOD(&Light::setIntensity, "nativeSetIntensity"));
-}
-
-} // namespace android
-} // namespace mb
diff --git a/platform/android/src/style/light.hpp b/platform/android/src/style/light.hpp
deleted file mode 100644
index 97767c4f76..0000000000
--- a/platform/android/src/style/light.hpp
+++ /dev/null
@@ -1,53 +0,0 @@
-#pragma once
-
-#include <mbgl/util/noncopyable.hpp>
-
-#include <jni/jni.hpp>
-#include <mbgl/style/light.hpp>
-#include "transition_options.hpp"
-#include "position.hpp"
-#include <mbgl/style/types.hpp>
-#include <mbgl/style/property_value.hpp>
-
-namespace mbgl {
-namespace android {
-
-using namespace style;
-
-class Light : private mbgl::util::noncopyable {
-public:
-
-    static constexpr auto Name() { return "com/mapbox/mapboxsdk/style/light/Light"; };
-
-    static void registerNative(jni::JNIEnv&);
-
-    static jni::Local<jni::Object<Light>> createJavaLightPeer(jni::JNIEnv&, mbgl::Map&, mbgl::style::Light&);
-
-    Light(mbgl::Map&, mbgl::style::Light&);
-
-    void setAnchor(jni::JNIEnv&, const jni::String&);
-    jni::Local<jni::String> getAnchor(jni::JNIEnv&);
-    void setPosition(jni::JNIEnv&, const jni::Object<Position>&);
-    jni::Local<jni::Object<Position>> getPosition(jni::JNIEnv&);
-    void setPositionTransition(jni::JNIEnv&, jlong duration, jlong delay);
-    jni::Local<jni::Object<TransitionOptions>> getPositionTransition(jni::JNIEnv&);
-    void setColor(jni::JNIEnv&, const jni::String&);
-    jni::Local<jni::String> getColor(jni::JNIEnv&);
-    void setColorTransition(jni::JNIEnv&, jlong duration, jlong delay);
-    jni::Local<jni::Object<TransitionOptions>> getColorTransition(jni::JNIEnv&);
-    void setIntensity(jni::JNIEnv&, jni::jfloat);
-    jni::jfloat getIntensity(jni::JNIEnv&);
-    void setIntensityTransition(jni::JNIEnv&, jlong duration, jlong delay);
-    jni::Local<jni::Object<TransitionOptions>> getIntensityTransition(jni::JNIEnv&);
-    jni::Local<jni::Object<Light>> createJavaPeer(jni::JNIEnv&);
-
-protected:
-
-    // Raw reference to the light
-    mbgl::style::Light& light;
-
-    // Map is set when the light is retrieved
-    mbgl::Map* map;
-};
-} // namespace android
-} // namespace mbgl
\ No newline at end of file
diff --git a/platform/android/src/style/position.cpp b/platform/android/src/style/position.cpp
deleted file mode 100644
index 326310be07..0000000000
--- a/platform/android/src/style/position.cpp
+++ /dev/null
@@ -1,35 +0,0 @@
-#include "position.hpp"
-
-namespace mbgl {
-namespace android {
-
-jni::Local<jni::Object<Position>> Position::fromPosition(jni::JNIEnv& env, jfloat radialCoordinate, jfloat azimuthalAngle, jfloat polarAngle) {
-    static auto& javaClass = jni::Class<Position>::Singleton(env);
-    static auto method = javaClass.GetStaticMethod<jni::Object<Position> (jfloat, jfloat, jfloat)>(env, "fromPosition");
-    return javaClass.Call(env, method, radialCoordinate, azimuthalAngle, polarAngle);
-}
-
-void Position::registerNative(jni::JNIEnv& env) {
-    jni::Class<Position>::Singleton(env);
-}
-
-float Position::getRadialCoordinate(jni::JNIEnv& env, const jni::Object<Position>& position) {
-    static auto& javaClass = jni::Class<Position>::Singleton(env);
-    static auto field = javaClass.GetField<jfloat>(env, "radialCoordinate");
-    return position.Get(env, field);
-}
-
-float Position::getAzimuthalAngle(jni::JNIEnv& env, const jni::Object<Position>& position) {
-    static auto& javaClass = jni::Class<Position>::Singleton(env);
-    static auto field = javaClass.GetField<jfloat>(env, "azimuthalAngle");
-    return position.Get(env, field);
-}
-
-float Position::getPolarAngle(jni::JNIEnv& env, const jni::Object<Position>& position) {
-    static auto& javaClass = jni::Class<Position>::Singleton(env);
-    static auto field = javaClass.GetField<jfloat>(env, "polarAngle");
-    return position.Get(env, field);
-}
-
-} // namespace android
-} // namespace mbgl
\ No newline at end of file
diff --git a/platform/android/src/style/position.hpp b/platform/android/src/style/position.hpp
deleted file mode 100644
index eb4f5ac674..0000000000
--- a/platform/android/src/style/position.hpp
+++ /dev/null
@@ -1,24 +0,0 @@
-#pragma once
-
-#include <mbgl/util/noncopyable.hpp>
-
-#include <jni/jni.hpp>
-
-namespace mbgl {
-namespace android {
-
-class Position : private mbgl::util::noncopyable {
-public:
-    static constexpr auto Name() { return "com/mapbox/mapboxsdk/style/light/Position"; };
-
-    static jni::Local<jni::Object<Position>> fromPosition(jni::JNIEnv&, jfloat, jfloat, jfloat);
-
-    static void registerNative(jni::JNIEnv&);
-
-    static float getRadialCoordinate(jni::JNIEnv&, const jni::Object<Position>&);
-    static float getAzimuthalAngle(jni::JNIEnv&, const jni::Object<Position>&);
-    static float getPolarAngle(jni::JNIEnv&, const jni::Object<Position>&);
-};
-
-} // namespace android
-} // namespace mbgl
\ No newline at end of file
diff --git a/platform/android/src/style/sources/custom_geometry_source.cpp b/platform/android/src/style/sources/custom_geometry_source.cpp
deleted file mode 100644
index 0d96a09916..0000000000
--- a/platform/android/src/style/sources/custom_geometry_source.cpp
+++ /dev/null
@@ -1,209 +0,0 @@
-#include "custom_geometry_source.hpp"
-#include "../../attach_env.hpp"
-
-#include <mbgl/renderer/query.hpp>
-
-// Java -> C++ conversion
-#include "../android_conversion.hpp"
-#include "../conversion/filter.hpp"
-
-// C++ -> Java conversion
-#include "../../conversion/conversion.hpp"
-#include "../../conversion/collection.hpp"
-#include "../../geojson/feature.hpp"
-#include <mbgl/style/conversion/custom_geometry_source_options.hpp>
-
-#include <string>
-
-namespace mbgl {
-namespace android {
-
-    // This conversion is expected not to fail because it's used only in contexts where
-    // the value was originally a CustomGeometrySourceOptions object on the Java side. If it fails
-    // to convert, it's a bug in our serialization or Java-side static typing.
-    static style::CustomGeometrySource::Options convertCustomGeometrySourceOptions(jni::JNIEnv& env,
-                                                                                   const jni::Object<>& options,
-                                                                                   style::TileFunction fetchFn,
-                                                                                   style::TileFunction cancelFn) {
-        using namespace mbgl::style::conversion;
-        if (!options) {
-            return style::CustomGeometrySource::Options();
-        }
-        Error error;
-        optional<style::CustomGeometrySource::Options> result = convert<style::CustomGeometrySource::Options>(Value(env, options), error);
-        if (!result) {
-            throw std::logic_error(error.message);
-        }
-        result->fetchTileFunction = fetchFn;
-        result->cancelTileFunction = cancelFn;
-        return *result;
-    }
-
-    CustomGeometrySource::CustomGeometrySource(jni::JNIEnv& env,
-                                               const jni::String& sourceId,
-                                               const jni::Object<>& options)
-        : Source(env, std::make_unique<mbgl::style::CustomGeometrySource>(
-                         jni::Make<std::string>(env, sourceId),
-                         convertCustomGeometrySourceOptions(env, options,
-                                 std::bind(&CustomGeometrySource::fetchTile, this, std::placeholders::_1),
-                                 std::bind(&CustomGeometrySource::cancelTile, this, std::placeholders::_1)))) {
-    }
-
-    CustomGeometrySource::CustomGeometrySource(jni::JNIEnv& env,
-                                               mbgl::style::Source& coreSource,
-                                               AndroidRendererFrontend* frontend)
-        : Source(env, coreSource, createJavaPeer(env), frontend) {}
-
-    CustomGeometrySource::~CustomGeometrySource() {
-        releaseThreads();
-    }
-
-    void CustomGeometrySource::fetchTile (const mbgl::CanonicalTileID& tileID) {
-        android::UniqueEnv _env = android::AttachEnv();
-
-        static auto& javaClass = jni::Class<CustomGeometrySource>::Singleton(*_env);
-        static auto fetchTile = javaClass.GetMethod<void (jni::jint, jni::jint, jni::jint)>(*_env, "fetchTile");
-
-        // The source is removed on the main thread, but it still exists on the Render thread until the frame is complete.
-        // This might cause fetchTile/cancelTile invocations when the Java thread is shutting down and the peer has already been released.
-        // See https://github.com/mapbox/mapbox-gl-native/issues/12551.
-        if(!javaPeer) {
-            return;
-        }
-
-        auto peer = jni::Cast(*_env, javaClass, javaPeer);
-        peer.Call(*_env, fetchTile, (int)tileID.z, (int)tileID.x, (int)tileID.y);
-    };
-
-    void CustomGeometrySource::cancelTile(const mbgl::CanonicalTileID& tileID) {
-        android::UniqueEnv _env = android::AttachEnv();
-
-        static auto& javaClass = jni::Class<CustomGeometrySource>::Singleton(*_env);
-        static auto cancelTile = javaClass.GetMethod<void (jni::jint, jni::jint, jni::jint)>(*_env, "cancelTile");
-
-        // The source is removed on the main thread, but it still exists on the Render thread until the frame is complete.
-        // This might cause fetchTile/cancelTile invocations when the Java thread is shutting down and the peer has already been released.
-        // See https://github.com/mapbox/mapbox-gl-native/issues/12551.
-        if(!javaPeer) {
-            return;
-        }
-
-        auto peer = jni::Cast(*_env, javaClass, javaPeer);
-        peer.Call(*_env, cancelTile, (int)tileID.z, (int)tileID.x, (int)tileID.y);
-    };
-
-    void CustomGeometrySource::startThreads() {
-        android::UniqueEnv _env = android::AttachEnv();
-
-        static auto& javaClass = jni::Class<CustomGeometrySource>::Singleton(*_env);
-        static auto startThreads = javaClass.GetMethod<void ()>(*_env, "startThreads");
-
-        assert(javaPeer);
-
-        auto peer = jni::Cast(*_env, javaClass, javaPeer);
-        peer.Call(*_env, startThreads);
-    }
-
-    void CustomGeometrySource::releaseThreads() {
-        android::UniqueEnv _env = android::AttachEnv();
-
-        static auto& javaClass = jni::Class<CustomGeometrySource>::Singleton(*_env);
-        static auto releaseThreads = javaClass.GetMethod<void ()>(*_env, "releaseThreads");
-
-        assert(javaPeer);
-
-        auto peer = jni::Cast(*_env, javaClass, javaPeer);
-        peer.Call(*_env, releaseThreads);
-    };
-
-    bool CustomGeometrySource::isCancelled(jni::jint z,
-                                                jni::jint x,
-                                                jni::jint y) {
-        android::UniqueEnv _env = android::AttachEnv();
-
-        static auto& javaClass = jni::Class<CustomGeometrySource>::Singleton(*_env);
-        static auto isCancelled = javaClass.GetMethod<jboolean (jni::jint, jni::jint, jni::jint)>(*_env, "isCancelled");
-
-        assert(javaPeer);
-
-        auto peer = jni::Cast(*_env, javaClass, javaPeer);
-        return peer.Call(*_env, isCancelled, z, x, y);
-    };
-
-    void CustomGeometrySource::setTileData(jni::JNIEnv& env,
-                                           jni::jint z,
-                                           jni::jint x,
-                                           jni::jint y,
-                                           const jni::Object<geojson::FeatureCollection>& jFeatures) {
-        using namespace mbgl::android::geojson;
-
-        // Convert the jni object
-        auto geometry = geojson::FeatureCollection::convert(env, jFeatures);
-
-        // Update the core source if not cancelled
-        if (!isCancelled(z, x ,y)) {
-            source.as<mbgl::style::CustomGeometrySource>()->CustomGeometrySource::setTileData(CanonicalTileID(z, x, y), GeoJSON(geometry));
-        }
-    }
-
-    void CustomGeometrySource::invalidateTile(jni::JNIEnv&, jni::jint z, jni::jint x, jni::jint y) {
-        source.as<mbgl::style::CustomGeometrySource>()->CustomGeometrySource::invalidateTile(CanonicalTileID(z, x, y));
-    }
-
-    void CustomGeometrySource::invalidateBounds(jni::JNIEnv& env, const jni::Object<LatLngBounds>& jBounds) {
-        auto bounds = LatLngBounds::getLatLngBounds(env, jBounds);
-        source.as<mbgl::style::CustomGeometrySource>()->CustomGeometrySource::invalidateRegion(bounds);
-    }
-
-    jni::Local<jni::Array<jni::Object<geojson::Feature>>> CustomGeometrySource::querySourceFeatures(jni::JNIEnv& env,
-                                                                        const jni::Array<jni::Object<>>& jfilter) {
-        using namespace mbgl::android::conversion;
-        using namespace mbgl::android::geojson;
-
-        std::vector<mbgl::Feature> features;
-        if (rendererFrontend) {
-            features = rendererFrontend->querySourceFeatures(source.getID(), { {},  toFilter(env, jfilter) });
-        }
-        return Feature::convert(env, features);
-    }
-
-    jni::Local<jni::Object<Source>> CustomGeometrySource::createJavaPeer(jni::JNIEnv& env) {
-        static auto& javaClass = jni::Class<CustomGeometrySource>::Singleton(env);
-        static auto constructor = javaClass.GetConstructor<jni::jlong>(env);
-        return javaClass.New(env, constructor, reinterpret_cast<jni::jlong>(this));
-    }
-
-    void CustomGeometrySource::addToMap(JNIEnv& env, const jni::Object<Source>& obj, mbgl::Map& map, AndroidRendererFrontend& frontend) {
-        Source::addToMap(env, obj, map, frontend);
-        startThreads();
-    }
-
-    bool CustomGeometrySource::removeFromMap(JNIEnv& env, const jni::Object<Source>& source, mbgl::Map& map) {
-        bool successfullyRemoved = Source::removeFromMap(env, source, map);
-        if (successfullyRemoved) {
-            releaseThreads();
-        }
-        return successfullyRemoved;
-    }
-
-    void CustomGeometrySource::registerNative(jni::JNIEnv& env) {
-        // Lookup the class
-        static auto& javaClass = jni::Class<CustomGeometrySource>::Singleton(env);
-
-        #define METHOD(MethodPtr, name) jni::MakeNativePeerMethod<decltype(MethodPtr), (MethodPtr)>(name)
-
-        // Register the peer
-        jni::RegisterNativePeer<CustomGeometrySource>(
-            env, javaClass, "nativePtr",
-            jni::MakePeer<CustomGeometrySource, const jni::String&, const jni::Object<>&>,
-            "initialize",
-            "finalize",
-            METHOD(&CustomGeometrySource::querySourceFeatures, "querySourceFeatures"),
-            METHOD(&CustomGeometrySource::setTileData, "nativeSetTileData"),
-            METHOD(&CustomGeometrySource::invalidateTile, "nativeInvalidateTile"),
-            METHOD(&CustomGeometrySource::invalidateBounds, "nativeInvalidateBounds")
-        );
-    }
-
-} // namespace android
-} // namespace mbgl
diff --git a/platform/android/src/style/sources/custom_geometry_source.hpp b/platform/android/src/style/sources/custom_geometry_source.hpp
deleted file mode 100644
index 6979ecc25d..0000000000
--- a/platform/android/src/style/sources/custom_geometry_source.hpp
+++ /dev/null
@@ -1,50 +0,0 @@
-#pragma once
-
-#include "source.hpp"
-#include <mbgl/style/sources/custom_geometry_source.hpp>
-#include <mbgl/util/geojson.hpp>
-#include <mbgl/tile/tile_id.hpp>
-#include "../../geojson/geometry.hpp"
-#include "../../geojson/feature.hpp"
-#include "../../geojson/feature_collection.hpp"
-#include "../../geometry/lat_lng_bounds.hpp"
-#include <jni/jni.hpp>
-
-namespace mbgl {
-namespace android {
-
-class CustomGeometrySource : public Source {
-public:
-    using SuperTag = Source;
-    static constexpr auto Name() { return "com/mapbox/mapboxsdk/style/sources/CustomGeometrySource"; };
-
-    static void registerNative(jni::JNIEnv&);
-
-    CustomGeometrySource(jni::JNIEnv&, const jni::String&, const jni::Object<>&);
-    CustomGeometrySource(jni::JNIEnv&, mbgl::style::Source&, AndroidRendererFrontend*);
-    ~CustomGeometrySource();
-
-    bool removeFromMap(JNIEnv&, const jni::Object<Source>&, mbgl::Map&) override;
-    void addToMap(JNIEnv&, const jni::Object<Source>&, mbgl::Map&, AndroidRendererFrontend&) override;
-
-    void fetchTile(const mbgl::CanonicalTileID& tileID);
-    void cancelTile(const mbgl::CanonicalTileID& tileID);
-    bool isCancelled(jni::jint z, jni::jint x, jni::jint y);
-    void startThreads();
-    void releaseThreads();
-
-private:
-    void setTileData(jni::JNIEnv& env, jni::jint z, jni::jint x, jni::jint y, const jni::Object<geojson::FeatureCollection>& jf);
-
-    void invalidateTile(jni::JNIEnv& env, jni::jint z, jni::jint x, jni::jint y);
-    void invalidateBounds(jni::JNIEnv& env, const jni::Object<LatLngBounds>& bounds);
-
-    jni::Local<jni::Array<jni::Object<geojson::Feature>>> querySourceFeatures(jni::JNIEnv&,
-                                                                  const jni::Array<jni::Object<>>& );
-
-    jni::Local<jni::Object<Source>> createJavaPeer(jni::JNIEnv&);
-
-}; // class CustomGeometrySource
-
-} // namespace android
-} // namespace mbgl
diff --git a/platform/android/src/style/sources/geojson_source.cpp b/platform/android/src/style/sources/geojson_source.cpp
deleted file mode 100644
index 0a287eb6da..0000000000
--- a/platform/android/src/style/sources/geojson_source.cpp
+++ /dev/null
@@ -1,259 +0,0 @@
-#include "geojson_source.hpp"
-#include <mbgl/style/sources/geojson_source_impl.hpp>
-#include "../../attach_env.hpp"
-
-#include <mbgl/renderer/query.hpp>
-
-// Java -> C++ conversion
-#include "../android_conversion.hpp"
-#include "../conversion/filter.hpp"
-#include <mbgl/style/conversion/geojson.hpp>
-#include <mbgl/style/conversion/geojson_options.hpp>
-#include <mbgl/style/conversion_impl.hpp>
-
-// C++ -> Java conversion
-#include "../../conversion/conversion.hpp"
-#include "../../conversion/collection.hpp"
-#include "../../geojson/feature.hpp"
-#include "../conversion/url_or_tileset.hpp"
-
-#include <string>
-
-// GeoJSONSource uses a "coalescing" model for high frequency asynchronous data update calls,
-// which in practice means, that any update that started processing is going to finish
-// and the last scheduled update is going to finish as well. Any updates scheduled during processing can be canceled.
-// Conversion from Java features to core ones is done on a worker thread and once finished,
-// the ownership of the converted features is returned to the calling thread.
-namespace mbgl {
-namespace android {
-
-    // This conversion is expected not to fail because it's used only in contexts where
-    // the value was originally a GeoJsonOptions object on the Java side. If it fails
-    // to convert, it's a bug in our serialization or Java-side static typing.
-static Immutable<style::GeoJSONOptions> convertGeoJSONOptions(jni::JNIEnv& env, const jni::Object<>& options) {
-    using namespace mbgl::style::conversion;
-    if (!options) {
-        return style::GeoJSONOptions::defaultOptions();
-    }
-    Error error;
-    optional<style::GeoJSONOptions> result = convert<style::GeoJSONOptions>(mbgl::android::Value(env, options), error);
-    if (!result) {
-        throw std::logic_error(error.message);
-    }
-    return makeMutable<style::GeoJSONOptions>(std::move(*result));
-}
-
-GeoJSONSource::GeoJSONSource(jni::JNIEnv& env, const jni::String& sourceId, const jni::Object<>& options)
-    : Source(env,
-             std::make_unique<mbgl::style::GeoJSONSource>(jni::Make<std::string>(env, sourceId),
-                                                          convertGeoJSONOptions(env, options))),
-      converter(std::make_unique<Actor<FeatureConverter>>(Scheduler::GetBackground(),
-                                                          source.as<style::GeoJSONSource>()->impl().getOptions())) {}
-
-GeoJSONSource::GeoJSONSource(jni::JNIEnv& env, mbgl::style::Source& coreSource, AndroidRendererFrontend* frontend)
-    : Source(env, coreSource, createJavaPeer(env), frontend),
-      converter(std::make_unique<Actor<FeatureConverter>>(Scheduler::GetBackground(),
-                                                          source.as<style::GeoJSONSource>()->impl().getOptions())) {}
-
-GeoJSONSource::~GeoJSONSource() = default;
-
-void GeoJSONSource::setGeoJSONString(jni::JNIEnv& env, const jni::String& jString) {
-    std::shared_ptr<std::string> json = std::make_shared<std::string>(jni::Make<std::string>(env, jString));
-
-    Update::Converter converterFn = [this, json](ActorRef<GeoJSONDataCallback> _callback) {
-        converter->self().invoke(&FeatureConverter::convertJson, json, _callback);
-    };
-
-    setAsync(converterFn);
-}
-
-    void GeoJSONSource::setFeatureCollection(jni::JNIEnv& env, const jni::Object<geojson::FeatureCollection>& jFeatures) {
-        setCollectionAsync(env, jFeatures);
-    }
-
-    void GeoJSONSource::setFeature(jni::JNIEnv& env, const jni::Object<geojson::Feature>& jFeature) {
-        setCollectionAsync(env, jFeature);
-    }
-
-    void GeoJSONSource::setGeometry(jni::JNIEnv& env, const jni::Object<geojson::Geometry>& jGeometry) {
-        setCollectionAsync(env, jGeometry);
-    }
-
-    void GeoJSONSource::setURL(jni::JNIEnv& env, const jni::String& url) {
-        // Update the core source
-        source.as<style::GeoJSONSource>()->setURL(jni::Make<std::string>(env, url));
-    }
-
-    jni::Local<jni::String> GeoJSONSource::getURL(jni::JNIEnv& env) {
-        optional<std::string> url = source.as<style::GeoJSONSource>()->getURL();
-        return url ? jni::Make<jni::String>(env, *url) : jni::Local<jni::String>();
-    }
-
-    jni::Local<jni::Array<jni::Object<geojson::Feature>>> GeoJSONSource::querySourceFeatures(jni::JNIEnv& env,
-                                                                        const jni::Array<jni::Object<>>& jfilter) {
-        using namespace mbgl::android::conversion;
-        using namespace mbgl::android::geojson;
-
-        std::vector<mbgl::Feature> features;
-        if (rendererFrontend) {
-            features = rendererFrontend->querySourceFeatures(source.getID(),
-                { {}, toFilter(env, jfilter) });
-        }
-        return Feature::convert(env, features);
-    }
-
-    jni::Local<jni::Array<jni::Object<geojson::Feature>>> GeoJSONSource::getClusterChildren(jni::JNIEnv& env, const jni::Object<geojson::Feature>& feature) {
-        using namespace mbgl::android::conversion;
-        using namespace mbgl::android::geojson;
-
-        if (rendererFrontend) {
-            mbgl::Feature _feature = Feature::convert(env, feature);
-            _feature.properties["cluster_id"] = static_cast<uint64_t>(_feature.properties["cluster_id"].get<double>());
-            const auto featureExtension = rendererFrontend->queryFeatureExtensions(source.getID(), _feature, "supercluster", "children", {});
-            if (featureExtension.is<mbgl::FeatureCollection>()) {
-                return Feature::convert(env, featureExtension.get<mbgl::FeatureCollection>());
-            }
-        }
-        return jni::Array<jni::Object<Feature>>::New(env, 0);
-    }
-
-    jni::Local<jni::Array<jni::Object<geojson::Feature>>> GeoJSONSource::getClusterLeaves(jni::JNIEnv& env, const jni::Object<geojson::Feature>& feature, jni::jlong limit, jni::jlong offset) {
-        using namespace mbgl::android::conversion;
-        using namespace mbgl::android::geojson;
-
-        if (rendererFrontend) {
-            mbgl::Feature _feature = Feature::convert(env, feature);
-            _feature.properties["cluster_id"] = static_cast<uint64_t>(_feature.properties["cluster_id"].get<double>());
-            const std::map<std::string, mbgl::Value> options = { {"limit", static_cast<uint64_t>(limit)},
-                                                                    {"offset", static_cast<uint64_t>(offset)} };
-            auto featureExtension = rendererFrontend->queryFeatureExtensions(source.getID(), _feature, "supercluster", "leaves", options);
-            if (featureExtension.is<mbgl::FeatureCollection>()) {
-                return Feature::convert(env, featureExtension.get<mbgl::FeatureCollection>());
-            }
-        }
-        return jni::Array<jni::Object<Feature>>::New(env, 0);;
-    }
-
-    jint GeoJSONSource::getClusterExpansionZoom(jni::JNIEnv& env, const jni::Object<geojson::Feature>& feature) {
-        using namespace mbgl::android::conversion;
-        using namespace mbgl::android::geojson;
-
-        if (rendererFrontend) {
-            mbgl::Feature _feature = Feature::convert(env, feature);
-            _feature.properties["cluster_id"] = static_cast<uint64_t>(_feature.properties["cluster_id"].get<double>());
-            auto featureExtension = rendererFrontend->queryFeatureExtensions(source.getID(), _feature, "supercluster", "expansion-zoom", {});
-            if (featureExtension.is<mbgl::Value>()) {
-                auto value = featureExtension.get<mbgl::Value>();
-                if (value.is<uint64_t>()) {
-                    return value.get<uint64_t>();
-                }
-            }
-        }
-        return 0;
-    }
-
-    jni::Local<jni::Object<Source>> GeoJSONSource::createJavaPeer(jni::JNIEnv& env) {
-        static auto& javaClass = jni::Class<GeoJSONSource>::Singleton(env);
-        static auto constructor = javaClass.GetConstructor<jni::jlong>(env);
-        return javaClass.New(env, constructor, reinterpret_cast<jni::jlong>(this));
-    }
-
-    template <class JNIType>
-    void GeoJSONSource::setCollectionAsync(jni::JNIEnv& env, const jni::Object<JNIType>& jObject) {
-        auto global = jni::NewGlobal<jni::EnvAttachingDeleter>(env, jObject);
-        auto object = std::make_shared<decltype(global)>(std::move(global));
-
-        Update::Converter converterFn = [this, object](ActorRef<GeoJSONDataCallback> _callback) {
-            converter->self().invoke(&FeatureConverter::convertObject<JNIType>, object, _callback);
-        };
-
-        setAsync(converterFn);
-    }
-
-    void GeoJSONSource::setAsync(Update::Converter converterFn) {
-        awaitingUpdate = std::make_unique<Update>(
-            std::move(converterFn),
-            std::make_unique<Actor<GeoJSONDataCallback>>(
-                *Scheduler::GetCurrent(), [this](std::shared_ptr<style::GeoJSONData> geoJSONData) {
-                    // conversion from Java features to core ones finished
-                    android::UniqueEnv _env = android::AttachEnv();
-
-                    // Update the core source
-                    source.as<mbgl::style::GeoJSONSource>()->setGeoJSONData(std::move(geoJSONData));
-
-                    // if there is an awaiting update, execute it, otherwise, release resources
-                    if (awaitingUpdate) {
-                        update = std::move(awaitingUpdate);
-                        update->converterFn(update->callback->self());
-                    } else {
-                        update.reset();
-                    }
-                }));
-
-        // If another update is running, wait
-        if (update) {
-            return;
-        }
-
-        // no updates are being processed, execute this one
-        update = std::move(awaitingUpdate);
-        update->converterFn(update->callback->self());
-    }
-
-    void GeoJSONSource::registerNative(jni::JNIEnv& env) {
-        // Lookup the class
-        static auto& javaClass = jni::Class<GeoJSONSource>::Singleton(env);
-
-        #define METHOD(MethodPtr, name) jni::MakeNativePeerMethod<decltype(MethodPtr), (MethodPtr)>(name)
-
-        // Register the peer
-        jni::RegisterNativePeer<GeoJSONSource>(
-            env, javaClass, "nativePtr",
-            jni::MakePeer<GeoJSONSource, const jni::String&, const jni::Object<>&>,
-            "initialize",
-            "finalize",
-            METHOD(&GeoJSONSource::setGeoJSONString, "nativeSetGeoJsonString"),
-            METHOD(&GeoJSONSource::setFeatureCollection, "nativeSetFeatureCollection"),
-            METHOD(&GeoJSONSource::setFeature, "nativeSetFeature"),
-            METHOD(&GeoJSONSource::setGeometry, "nativeSetGeometry"),
-            METHOD(&GeoJSONSource::setURL, "nativeSetUrl"),
-            METHOD(&GeoJSONSource::getURL, "nativeGetUrl"),
-            METHOD(&GeoJSONSource::querySourceFeatures, "querySourceFeatures"),
-            METHOD(&GeoJSONSource::getClusterChildren, "nativeGetClusterChildren"),
-            METHOD(&GeoJSONSource::getClusterLeaves, "nativeGetClusterLeaves"),
-            METHOD(&GeoJSONSource::getClusterExpansionZoom, "nativeGetClusterExpansionZoom")
-        );
-    }
-
-    void FeatureConverter::convertJson(std::shared_ptr<std::string> json, ActorRef<GeoJSONDataCallback> callback) {
-        using namespace mbgl::style::conversion;
-
-        android::UniqueEnv _env = android::AttachEnv();
-        // Convert the jni object
-        Error error;
-        optional<GeoJSON> converted = parseGeoJSON(*json, error);
-        if(!converted) {
-            mbgl::Log::Error(mbgl::Event::JNI, "Error setting geo json: " + error.message);
-            return;
-        }
-
-        callback.invoke(&GeoJSONDataCallback::operator(), style::GeoJSONData::create(*converted, options));
-    }
-
-    template <class JNIType>
-    void FeatureConverter::convertObject(
-        std::shared_ptr<jni::Global<jni::Object<JNIType>, jni::EnvAttachingDeleter>> jObject,
-        ActorRef<GeoJSONDataCallback> callback) {
-        using namespace mbgl::android::geojson;
-
-        android::UniqueEnv _env = android::AttachEnv();
-        // Convert the jni object
-        auto geometry = JNIType::convert(*_env, *jObject);
-        callback.invoke(&GeoJSONDataCallback::operator(), style::GeoJSONData::create(geometry, options));
-    }
-
-    Update::Update(Converter _converterFn, std::unique_ptr<Actor<GeoJSONDataCallback>> _callback)
-        : converterFn(std::move(_converterFn)), callback(std::move(_callback)) {}
-
-} // namespace android
-} // namespace mbgl
diff --git a/platform/android/src/style/sources/geojson_source.hpp b/platform/android/src/style/sources/geojson_source.hpp
deleted file mode 100644
index c7ef6e54de..0000000000
--- a/platform/android/src/style/sources/geojson_source.hpp
+++ /dev/null
@@ -1,79 +0,0 @@
-#pragma once
-
-#include "source.hpp"
-#include <mbgl/style/sources/geojson_source.hpp>
-#include "../../geojson/geometry.hpp"
-#include "../../geojson/feature.hpp"
-#include "../../geojson/feature_collection.hpp"
-#include "../../android_renderer_frontend.hpp"
-#include <jni/jni.hpp>
-
-namespace mbgl {
-namespace android {
-
-using GeoJSONDataCallback = std::function<void(std::shared_ptr<style::GeoJSONData>)>;
-
-class FeatureConverter {
-public:
-    explicit FeatureConverter(Immutable<style::GeoJSONOptions> options_) : options(std::move(options_)) {}
-    void convertJson(std::shared_ptr<std::string>, ActorRef<GeoJSONDataCallback>);
-
-    template <class JNIType>
-    void convertObject(std::shared_ptr<jni::Global<jni::Object<JNIType>, jni::EnvAttachingDeleter>>,
-                       ActorRef<GeoJSONDataCallback>);
-
-private:
-    Immutable<style::GeoJSONOptions> options;
-};
-
-struct Update {
-    using Converter = std::function<void(ActorRef<GeoJSONDataCallback>)>;
-    Converter converterFn;
-
-    std::unique_ptr<Actor<GeoJSONDataCallback>> callback;
-
-    Update(Converter, std::unique_ptr<Actor<GeoJSONDataCallback>>);
-};
-
-class GeoJSONSource : public Source {
-public:
-    using SuperTag = Source;
-    static constexpr auto Name() { return "com/mapbox/mapboxsdk/style/sources/GeoJsonSource"; };
-
-    static void registerNative(jni::JNIEnv&);
-
-    GeoJSONSource(jni::JNIEnv&, const jni::String&, const jni::Object<>&);
-    GeoJSONSource(jni::JNIEnv&, mbgl::style::Source&, AndroidRendererFrontend*);
-    ~GeoJSONSource();
-
-private:
-    void setGeoJSONString(jni::JNIEnv&, const jni::String&);
-    void setFeatureCollection(jni::JNIEnv&, const jni::Object<geojson::FeatureCollection>&);
-    void setFeature(jni::JNIEnv&, const jni::Object<geojson::Feature>&);
-    void setGeometry(jni::JNIEnv&, const jni::Object<geojson::Geometry>&);
-    void setURL(jni::JNIEnv&, const jni::String&);
-
-    jni::Local<jni::Array<jni::Object<geojson::Feature>>> querySourceFeatures(jni::JNIEnv&,
-                                                                  const jni::Array<jni::Object<>>&);
-
-    jni::Local<jni::Array<jni::Object<geojson::Feature>>> getClusterChildren(jni::JNIEnv&, const jni::Object<geojson::Feature>&);
-    jni::Local<jni::Array<jni::Object<geojson::Feature>>> getClusterLeaves(jni::JNIEnv&, const jni::Object<geojson::Feature>&, jni::jlong, jni::jlong);
-    jint getClusterExpansionZoom(jni::JNIEnv&, const jni::Object<geojson::Feature>&);
-
-    jni::Local<jni::String> getURL(jni::JNIEnv&);
-
-    jni::Local<jni::Object<Source>> createJavaPeer(jni::JNIEnv&);
-    std::unique_ptr<Update> awaitingUpdate;
-    std::unique_ptr<Update> update;
-    std::shared_ptr<ThreadPool> threadPool;
-    std::unique_ptr<Actor<FeatureConverter>> converter;
-
-    template <class JNIType>
-    void setCollectionAsync(jni::JNIEnv&, const jni::Object<JNIType>&);
-
-    void setAsync(Update::Converter);
-
-}; // class GeoJSONSource
-
-} // namespace android
-} // namespace mbgl
diff --git a/platform/android/src/style/sources/image_source.cpp b/platform/android/src/style/sources/image_source.cpp
deleted file mode 100644
index 448ecd2160..0000000000
--- a/platform/android/src/style/sources/image_source.cpp
+++ /dev/null
@@ -1,76 +0,0 @@
-#include "image_source.hpp"
-
-// Java -> C++ conversion
-#include "../android_conversion.hpp"
-
-// C++ -> Java conversion
-#include "../../conversion/conversion.hpp"
-#include <mbgl/style/conversion_impl.hpp>
-#include <mbgl/util/premultiply.hpp>
-
-#include "../../bitmap.hpp"
-#include <string>
-#include <array>
-
-namespace mbgl {
-namespace android {
-
-    ImageSource::ImageSource(jni::JNIEnv& env, const jni::String& sourceId, const jni::Object<LatLngQuad>& coordinatesObject)
-        : Source(env, std::make_unique<mbgl::style::ImageSource>(
-                jni::Make<std::string>(env, sourceId),
-                LatLngQuad::getLatLngArray(env, coordinatesObject)
-                )
-            ) {
-    }
-
-    ImageSource::ImageSource(jni::JNIEnv& env, mbgl::style::Source& coreSource, AndroidRendererFrontend* frontend)
-        : Source(env, coreSource, createJavaPeer(env), frontend) {}
-
-    ImageSource::~ImageSource() = default;
-
-    void ImageSource::setURL(jni::JNIEnv& env, const jni::String& url) {
-        // Update the core source
-        source.as<mbgl::style::ImageSource>()->ImageSource::setURL(jni::Make<std::string>(env, url));
-    }
-
-    jni::Local<jni::String> ImageSource::getURL(jni::JNIEnv& env) {
-        optional<std::string> url = source.as<mbgl::style::ImageSource>()->ImageSource::getURL();
-        return url ? jni::Make<jni::String>(env, *url) : jni::Local<jni::String>();
-    }
-
-    void ImageSource::setImage(jni::JNIEnv& env, const jni::Object<Bitmap>& bitmap) {
-        source.as<mbgl::style::ImageSource>()->setImage(Bitmap::GetImage(env, bitmap));
-    }
-
-    void ImageSource::setCoordinates(jni::JNIEnv& env, const jni::Object<LatLngQuad>& coordinatesObject) {
-        source.as<mbgl::style::ImageSource>()->setCoordinates(
-                LatLngQuad::getLatLngArray(env, coordinatesObject));
-    }
-
-    jni::Local<jni::Object<Source>> ImageSource::createJavaPeer(jni::JNIEnv& env) {
-        static auto& javaClass = jni::Class<ImageSource>::Singleton(env);
-        static auto constructor = javaClass.GetConstructor<jni::jlong>(env);
-        return javaClass.New(env, constructor, reinterpret_cast<jni::jlong>(this));
-    }
-
-    void ImageSource::registerNative(jni::JNIEnv& env) {
-        // Lookup the class
-        static auto& javaClass = jni::Class<ImageSource>::Singleton(env);
-
-        #define METHOD(MethodPtr, name) jni::MakeNativePeerMethod<decltype(MethodPtr), (MethodPtr)>(name)
-
-        // Register the peer
-        jni::RegisterNativePeer<ImageSource>(
-                env, javaClass, "nativePtr",
-                jni::MakePeer<ImageSource, const jni::String&, const jni::Object<LatLngQuad>&>,
-                "initialize",
-                "finalize",
-                METHOD(&ImageSource::setURL, "nativeSetUrl"),
-                METHOD(&ImageSource::getURL, "nativeGetUrl"),
-                METHOD(&ImageSource::setImage, "nativeSetImage"),
-                METHOD(&ImageSource::setCoordinates, "nativeSetCoordinates")
-        );
-    }
-
-} // namespace android
-} // namespace mbgl
diff --git a/platform/android/src/style/sources/image_source.hpp b/platform/android/src/style/sources/image_source.hpp
deleted file mode 100644
index da88feac74..0000000000
--- a/platform/android/src/style/sources/image_source.hpp
+++ /dev/null
@@ -1,39 +0,0 @@
-#pragma once
-
-#include "source.hpp"
-#include "../../geometry/lat_lng_quad.hpp"
-#include <mbgl/style/sources/image_source.hpp>
-#include <jni/jni.hpp>
-
-namespace mbgl {
-namespace android {
-
-class Bitmap;
-
-class ImageSource : public Source {
-public:
-    using SuperTag = Source;
-    static constexpr auto Name() { return "com/mapbox/mapboxsdk/style/sources/ImageSource"; };
-
-    static void registerNative(jni::JNIEnv&);
-
-    ImageSource(jni::JNIEnv&, const jni::String&, const jni::Object<LatLngQuad>&);
-
-    ImageSource(jni::JNIEnv&, mbgl::style::Source&, AndroidRendererFrontend*);
-
-    ~ImageSource();
-
-    void setURL(jni::JNIEnv&, const jni::String&);
-    jni::Local<jni::String> getURL(jni::JNIEnv&);
-
-    void setImage(jni::JNIEnv&, const jni::Object<Bitmap>&);
-
-    void setCoordinates(jni::JNIEnv&, const jni::Object<LatLngQuad>&);
-
-private:
-    jni::Local<jni::Object<Source>> createJavaPeer(jni::JNIEnv&);
-
-}; // class ImageSource
-
-} // namespace android
-} // namespace mbgl
diff --git a/platform/android/src/style/sources/raster_dem_source.cpp b/platform/android/src/style/sources/raster_dem_source.cpp
deleted file mode 100644
index a33e002598..0000000000
--- a/platform/android/src/style/sources/raster_dem_source.cpp
+++ /dev/null
@@ -1,61 +0,0 @@
-#include "raster_dem_source.hpp"
-
-#include "../android_conversion.hpp"
-#include "../value.hpp"
-#include "../conversion/url_or_tileset.hpp"
-#include "source.hpp"
-
-#include <mbgl/util/variant.hpp>
-
-#include <string>
-
-namespace mbgl {
-namespace android {
-
-    RasterDEMSource::RasterDEMSource(jni::JNIEnv& env, const jni::String& sourceId, const jni::Object<>& urlOrTileSet, jni::jint tileSize)
-        : Source(
-            env,
-            std::make_unique<mbgl::style::RasterDEMSource>(
-                jni::Make<std::string>(env, sourceId),
-                convertURLOrTileset(Value(env, urlOrTileSet)),
-                tileSize
-            )
-        ) {
-    }
-
-    RasterDEMSource::RasterDEMSource(jni::JNIEnv& env,
-                                     mbgl::style::Source& coreSource,
-                                     AndroidRendererFrontend* frontend)
-        : Source(env, coreSource, createJavaPeer(env), frontend) {}
-
-    RasterDEMSource::~RasterDEMSource() = default;
-
-    jni::Local<jni::String> RasterDEMSource::getURL(jni::JNIEnv& env) {
-        optional<std::string> url = source.as<mbgl::style::RasterDEMSource>()->RasterDEMSource::getURL();
-        return url ? jni::Make<jni::String>(env, *url) : jni::Local<jni::String>();
-    }
-
-    jni::Local<jni::Object<Source>> RasterDEMSource::createJavaPeer(jni::JNIEnv& env) {
-        static auto& javaClass = jni::Class<RasterDEMSource>::Singleton(env);
-        static auto constructor = javaClass.GetConstructor<jni::jlong>(env);
-        return javaClass.New(env, constructor, reinterpret_cast<jni::jlong>(this));
-    }
-
-    void RasterDEMSource::registerNative(jni::JNIEnv& env) {
-        // Lookup the class
-        static auto& javaClass = jni::Class<RasterDEMSource>::Singleton(env);
-
-        #define METHOD(MethodPtr, name) jni::MakeNativePeerMethod<decltype(MethodPtr), (MethodPtr)>(name)
-
-        // Register the peer
-        jni::RegisterNativePeer<RasterDEMSource>(
-            env, javaClass, "nativePtr",
-            jni::MakePeer<RasterDEMSource, const jni::String&, const jni::Object<>&, jni::jint>,
-            "initialize",
-            "finalize",
-            METHOD(&RasterDEMSource::getURL, "nativeGetUrl")
-        );
-    }
-
-} // namespace android
-} // namespace mbgl
diff --git a/platform/android/src/style/sources/raster_dem_source.hpp b/platform/android/src/style/sources/raster_dem_source.hpp
deleted file mode 100644
index 581e8f8bc6..0000000000
--- a/platform/android/src/style/sources/raster_dem_source.hpp
+++ /dev/null
@@ -1,29 +0,0 @@
-#pragma once
-
-#include "source.hpp"
-#include <mbgl/style/sources/raster_dem_source.hpp>
-#include <jni/jni.hpp>
-
-namespace mbgl {
-namespace android {
-
-class RasterDEMSource : public Source {
-public:
-    using SuperTag = Source;
-    static constexpr auto Name() { return "com/mapbox/mapboxsdk/style/sources/RasterDemSource"; };
-
-    static void registerNative(jni::JNIEnv&);
-
-    RasterDEMSource(jni::JNIEnv&, const jni::String&, const jni::Object<>&, jni::jint);
-    RasterDEMSource(jni::JNIEnv&, mbgl::style::Source&, AndroidRendererFrontend*);
-    ~RasterDEMSource();
-
-    jni::Local<jni::String> getURL(jni::JNIEnv&);
-
-private:
-    jni::Local<jni::Object<Source>> createJavaPeer(jni::JNIEnv&);
-
-}; // class RasterDEMSource
-
-} // namespace android
-} // namespace mbgl
diff --git a/platform/android/src/style/sources/raster_source.cpp b/platform/android/src/style/sources/raster_source.cpp
deleted file mode 100644
index 67603e74cd..0000000000
--- a/platform/android/src/style/sources/raster_source.cpp
+++ /dev/null
@@ -1,58 +0,0 @@
-#include "raster_source.hpp"
-
-#include "../android_conversion.hpp"
-#include "../value.hpp"
-#include "../conversion/url_or_tileset.hpp"
-
-#include <mbgl/util/variant.hpp>
-
-#include <string>
-
-namespace mbgl {
-namespace android {
-
-    RasterSource::RasterSource(jni::JNIEnv& env, const jni::String& sourceId, const jni::Object<>& urlOrTileSet, jni::jint tileSize)
-        : Source(
-            env,
-            std::make_unique<mbgl::style::RasterSource>(
-                jni::Make<std::string>(env, sourceId),
-                convertURLOrTileset(Value(env, urlOrTileSet)),
-                tileSize
-            )
-        ) {
-    }
-
-    RasterSource::RasterSource(jni::JNIEnv& env, mbgl::style::Source& coreSource, AndroidRendererFrontend* frontend)
-        : Source(env, coreSource, createJavaPeer(env), frontend) {}
-
-    RasterSource::~RasterSource() = default;
-
-    jni::Local<jni::String> RasterSource::getURL(jni::JNIEnv& env) {
-        optional<std::string> url = source.as<mbgl::style::RasterSource>()->RasterSource::getURL();
-        return url ? jni::Make<jni::String>(env, *url) : jni::Local<jni::String>();
-    }
-
-    jni::Local<jni::Object<Source>> RasterSource::createJavaPeer(jni::JNIEnv& env) {
-        static auto& javaClass = jni::Class<RasterSource>::Singleton(env);
-        static auto constructor = javaClass.GetConstructor<jni::jlong>(env);
-        return javaClass.New(env, constructor, reinterpret_cast<jni::jlong>(this));
-    }
-
-    void RasterSource::registerNative(jni::JNIEnv& env) {
-        // Lookup the class
-        static auto& javaClass = jni::Class<RasterSource>::Singleton(env);
-
-        #define METHOD(MethodPtr, name) jni::MakeNativePeerMethod<decltype(MethodPtr), (MethodPtr)>(name)
-
-        // Register the peer
-        jni::RegisterNativePeer<RasterSource>(
-            env, javaClass, "nativePtr",
-            jni::MakePeer<RasterSource, const jni::String&, const jni::Object<>&, jni::jint>,
-            "initialize",
-            "finalize",
-            METHOD(&RasterSource::getURL, "nativeGetUrl")
-        );
-    }
-
-} // namespace android
-} // namespace mbgl
diff --git a/platform/android/src/style/sources/raster_source.hpp b/platform/android/src/style/sources/raster_source.hpp
deleted file mode 100644
index e1bc5ca7ae..0000000000
--- a/platform/android/src/style/sources/raster_source.hpp
+++ /dev/null
@@ -1,29 +0,0 @@
-#pragma once
-
-#include "source.hpp"
-#include <mbgl/style/sources/raster_source.hpp>
-#include <jni/jni.hpp>
-
-namespace mbgl {
-namespace android {
-
-class RasterSource : public Source {
-public:
-    using SuperTag = Source;
-    static constexpr auto Name() { return "com/mapbox/mapboxsdk/style/sources/RasterSource"; };
-
-    static void registerNative(jni::JNIEnv&);
-
-    RasterSource(jni::JNIEnv&, const jni::String&, const jni::Object<>&, jni::jint);
-    RasterSource(jni::JNIEnv&, mbgl::style::Source&, AndroidRendererFrontend*);
-    ~RasterSource();
-
-    jni::Local<jni::String> getURL(jni::JNIEnv&);
-
-private:
-    jni::Local<jni::Object<Source>> createJavaPeer(jni::JNIEnv&);
-
-}; // class RasterSource
-
-} // namespace android
-} // namespace mbgl
diff --git a/platform/android/src/style/sources/unknown_source.cpp b/platform/android/src/style/sources/unknown_source.cpp
deleted file mode 100644
index acfd52db8d..0000000000
--- a/platform/android/src/style/sources/unknown_source.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-#include "unknown_source.hpp"
-
-namespace {
-
-    // Dummy initializer (We don't support initializing this from the JVM)
-    std::unique_ptr<mbgl::android::UnknownSource> init(jni::JNIEnv&) {
-        throw std::runtime_error("UnknownSource should not be initialized from the JVM");
-    }
-
-} // namespace
-
-namespace mbgl {
-namespace android {
-
-UnknownSource::UnknownSource(jni::JNIEnv& env, mbgl::style::Source& coreSource, AndroidRendererFrontend* frontend)
-    : Source(env, coreSource, createJavaPeer(env), frontend) {}
-
-jni::Local<jni::Object<Source>> UnknownSource::createJavaPeer(jni::JNIEnv& env) {
-    static auto& javaClass = jni::Class<UnknownSource>::Singleton(env);
-    static auto constructor = javaClass.GetConstructor<jni::jlong>(env);
-    return javaClass.New(env, constructor, reinterpret_cast<jni::jlong>(this));
-}
-
-    void UnknownSource::registerNative(jni::JNIEnv& env) {
-        // Lookup the class
-        static auto& javaClass = jni::Class<UnknownSource>::Singleton(env);
-
-        #define METHOD(MethodPtr, name) jni::MakeNativePeerMethod<decltype(MethodPtr), (MethodPtr)>(name)
-
-        // Register the peer
-        jni::RegisterNativePeer<UnknownSource>(
-            env, javaClass, "nativePtr",
-            init,
-            "initialize",
-            "finalize"
-        );
-    }
-
-} // namespace android
-} // namespace mbgl
diff --git a/platform/android/src/style/sources/unknown_source.hpp b/platform/android/src/style/sources/unknown_source.hpp
deleted file mode 100644
index ab5a2da82f..0000000000
--- a/platform/android/src/style/sources/unknown_source.hpp
+++ /dev/null
@@ -1,27 +0,0 @@
-#pragma once
-
-#include "source.hpp"
-#include <mbgl/style/source.hpp>
-#include <jni/jni.hpp>
-
-namespace mbgl {
-namespace android {
-
-class UnknownSource : public Source {
-public:
-    using SuperTag = Source;
-    static constexpr auto Name() { return "com/mapbox/mapboxsdk/style/sources/UnknownSource"; };
-
-    static void registerNative(jni::JNIEnv&);
-
-    UnknownSource(jni::JNIEnv&, mbgl::style::Source&, AndroidRendererFrontend*);
-
-    ~UnknownSource() = default;
-
-private:
-    jni::Local<jni::Object<Source>> createJavaPeer(jni::JNIEnv&);
-
-}; // class UnknownSource
-
-} // namespace android
-} // namespace mbgl
diff --git a/platform/android/src/style/sources/vector_source.cpp b/platform/android/src/style/sources/vector_source.cpp
deleted file mode 100644
index 2be1a78119..0000000000
--- a/platform/android/src/style/sources/vector_source.cpp
+++ /dev/null
@@ -1,81 +0,0 @@
-#include "vector_source.hpp"
-
-#include <mbgl/renderer/query.hpp>
-
-// Java -> C++ conversion
-#include "../android_conversion.hpp"
-#include "../conversion/filter.hpp"
-
-// C++ -> Java conversion
-#include "../../conversion/conversion.hpp"
-#include "../../conversion/collection.hpp"
-#include "../../geojson/feature.hpp"
-#include "../conversion/url_or_tileset.hpp"
-
-#include <mbgl/util/variant.hpp>
-
-#include <string>
-#include <vector>
-
-namespace mbgl {
-namespace android {
-
-    VectorSource::VectorSource(jni::JNIEnv& env, const jni::String& sourceId, const jni::Object<>& urlOrTileSet)
-        : Source(
-            env,
-            std::make_unique<mbgl::style::VectorSource>(
-                jni::Make<std::string>(env, sourceId),
-                convertURLOrTileset(Value(env, urlOrTileSet))
-            )
-        ) {
-    }
-
-    VectorSource::VectorSource(jni::JNIEnv& env, mbgl::style::Source& coreSource, AndroidRendererFrontend* frontend)
-        : Source(env, coreSource, createJavaPeer(env), frontend) {}
-
-    VectorSource::~VectorSource() = default;
-
-    jni::Local<jni::String> VectorSource::getURL(jni::JNIEnv& env) {
-        optional<std::string> url = source.as<mbgl::style::VectorSource>()->VectorSource::getURL();
-        return url ? jni::Make<jni::String>(env, *url) : jni::Local<jni::String>();
-    }
-
-    jni::Local<jni::Array<jni::Object<geojson::Feature>>> VectorSource::querySourceFeatures(jni::JNIEnv& env,
-                                                                             const jni::Array<jni::String>& jSourceLayerIds,
-                                                                             const jni::Array<jni::Object<>>& jfilter) {
-        using namespace mbgl::android::conversion;
-        using namespace mbgl::android::geojson;
-
-        std::vector<mbgl::Feature> features;
-        if (rendererFrontend) {
-            features = rendererFrontend->querySourceFeatures(source.getID(),
-                { toVector(env, jSourceLayerIds), toFilter(env, jfilter) });
-        }
-        return Feature::convert(env, features);
-    }
-
-    jni::Local<jni::Object<Source>> VectorSource::createJavaPeer(jni::JNIEnv& env) {
-        static auto& javaClass = jni::Class<VectorSource>::Singleton(env);
-        static auto constructor = javaClass.GetConstructor<jni::jlong>(env);
-        return javaClass.New(env, constructor, reinterpret_cast<jni::jlong>(this));
-    }
-
-    void VectorSource::registerNative(jni::JNIEnv& env) {
-        // Lookup the class
-        static auto& javaClass = jni::Class<VectorSource>::Singleton(env);
-
-        #define METHOD(MethodPtr, name) jni::MakeNativePeerMethod<decltype(MethodPtr), (MethodPtr)>(name)
-
-        // Register the peer
-        jni::RegisterNativePeer<VectorSource>(
-            env, javaClass, "nativePtr",
-            jni::MakePeer<VectorSource, const jni::String&, const jni::Object<>&>,
-            "initialize",
-            "finalize",
-            METHOD(&VectorSource::querySourceFeatures, "querySourceFeatures"),
-            METHOD(&VectorSource::getURL, "nativeGetUrl")
-        );
-    }
-
-} // namespace android
-} // namespace mbgl
diff --git a/platform/android/src/style/sources/vector_source.hpp b/platform/android/src/style/sources/vector_source.hpp
deleted file mode 100644
index 7ae2e8c9e7..0000000000
--- a/platform/android/src/style/sources/vector_source.hpp
+++ /dev/null
@@ -1,33 +0,0 @@
-#pragma once
-
-#include "source.hpp"
-#include <mbgl/style/sources/vector_source.hpp>
-#include "../../geojson/feature.hpp"
-#include <jni/jni.hpp>
-
-namespace mbgl {
-namespace android {
-
-class VectorSource : public Source {
-public:
-    using SuperTag = Source;
-    static constexpr auto Name() { return "com/mapbox/mapboxsdk/style/sources/VectorSource"; };
-
-    static void registerNative(jni::JNIEnv&);
-
-    VectorSource(jni::JNIEnv&, const jni::String&, const jni::Object<>&);
-    VectorSource(jni::JNIEnv&, mbgl::style::Source&, AndroidRendererFrontend*);
-    ~VectorSource();
-
-private:
-    jni::Local<jni::Array<jni::Object<geojson::Feature>>> querySourceFeatures(jni::JNIEnv&, const jni::Array<jni::String>&,
-                                                                  const jni::Array<jni::Object<>>& jfilter);
-
-    jni::Local<jni::String> getURL(jni::JNIEnv&);
-
-    jni::Local<jni::Object<Source>> createJavaPeer(jni::JNIEnv&);
-
-}; // class VectorSource
-
-} // namespace android
-} // namespace mbgl
diff --git a/platform/android/src/style/transition_options.cpp b/platform/android/src/style/transition_options.cpp
deleted file mode 100644
index d70a04e0d5..0000000000
--- a/platform/android/src/style/transition_options.cpp
+++ /dev/null
@@ -1,35 +0,0 @@
-#include "transition_options.hpp"
-
-namespace mbgl {
-namespace android {
-
-jni::Local<jni::Object<TransitionOptions>> TransitionOptions::fromTransitionOptions(jni::JNIEnv& env, jlong duration, jlong delay, jboolean enablePlacementTransitions) {
-    static auto& javaClass = jni::Class<TransitionOptions>::Singleton(env);
-    static auto method = javaClass.GetStaticMethod<jni::Object<TransitionOptions> (jlong, jlong, jboolean)>(env, "fromTransitionOptions");
-    return javaClass.Call(env, method, duration, delay, enablePlacementTransitions);
-}
-
-long TransitionOptions::getDuration(jni::JNIEnv& env, const jni::Object<TransitionOptions>& transitionOptions) {
-    static auto& javaClass = jni::Class<TransitionOptions>::Singleton(env);
-    static auto field = javaClass.GetField<jlong>(env, "duration");
-    return transitionOptions.Get(env, field);
-}
-
-long TransitionOptions::getDelay(jni::JNIEnv& env, const jni::Object<TransitionOptions>& transitionOptions) {
-    static auto& javaClass = jni::Class<TransitionOptions>::Singleton(env);
-    static auto field = javaClass.GetField<jlong>(env, "delay");
-    return transitionOptions.Get(env, field);
-}
-
-bool TransitionOptions::isEnablePlacementTransitions(jni::JNIEnv& env, const jni::Object<mbgl::android::TransitionOptions>& transitionOptions) {
-    static auto& javaClass = jni::Class<TransitionOptions>::Singleton(env);
-    static auto field = javaClass.GetField<jboolean >(env, "enablePlacementTransitions");
-    return transitionOptions.Get(env, field);
-}
-
-void TransitionOptions::registerNative(jni::JNIEnv& env) {
-    jni::Class<TransitionOptions>::Singleton(env);
-}
-
-} // namespace android
-} // namespace mbgl
\ No newline at end of file
diff --git a/platform/android/src/style/transition_options.hpp b/platform/android/src/style/transition_options.hpp
deleted file mode 100644
index 58656a9463..0000000000
--- a/platform/android/src/style/transition_options.hpp
+++ /dev/null
@@ -1,26 +0,0 @@
-#pragma once
-
-#include <mbgl/util/noncopyable.hpp>
-
-#include <jni/jni.hpp>
-
-namespace mbgl {
-namespace android {
-
-class TransitionOptions : private mbgl::util::noncopyable {
-public:
-    static constexpr auto Name() { return "com/mapbox/mapboxsdk/style/layers/TransitionOptions"; };
-
-    static jni::Local<jni::Object<TransitionOptions>> fromTransitionOptions(jni::JNIEnv&, jlong duration, jlong delay, jboolean enablePlacementTransitions);
-
-    static long getDuration(jni::JNIEnv&, const jni::Object<TransitionOptions>&);
-
-    static long getDelay(jni::JNIEnv&, const jni::Object<TransitionOptions>&);
-
-    static bool isEnablePlacementTransitions(jni::JNIEnv&, const jni::Object<TransitionOptions>&);
-
-    static void registerNative(jni::JNIEnv&);
-};
-
-} // namespace android
-} // namespace mbgl
\ No newline at end of file
diff --git a/platform/android/src/style/value.cpp b/platform/android/src/style/value.cpp
deleted file mode 100644
index 2f04840729..0000000000
--- a/platform/android/src/style/value.cpp
+++ /dev/null
@@ -1,83 +0,0 @@
-#include "value.hpp"
-
-#include "../java_types.hpp"
-
-namespace mbgl {
-namespace android {
-    // Instance
-
-    Value::Value(jni::JNIEnv& _env, jni::Local<jni::Object<>> _value)
-        : env(_env),
-          value(std::move(_value)) {}
-
-    Value::Value(jni::JNIEnv& _env, const jni::Object<>& _value)
-        : env(_env),
-          value(jni::NewLocal(_env, _value)) {}
-
-    bool Value::isNull() const {
-        return !value;
-    }
-
-    bool Value::isArray() const {
-        return jni::IsInstanceOf(env, value.get(), *java::ObjectArray::jclass);
-    }
-
-    bool Value::isObject() const {
-        return jni::IsInstanceOf(env, value.get(), *java::Map::jclass);
-    }
-
-    bool Value::isString() const {
-        return jni::IsInstanceOf(env, value.get(), *java::String::jclass);
-    }
-
-    bool Value::isBool() const {
-        return jni::IsInstanceOf(env, value.get(), *java::Boolean::jclass);
-    }
-
-    bool Value::isNumber() const {
-        return jni::IsInstanceOf(env, value.get(), *java::Number::jclass);
-    }
-
-    std::string Value::toString() const {
-        return jni::Make<std::string>(env, jni::Cast(env, jni::Class<jni::StringTag>::Singleton(env), value));
-    }
-
-    float Value::toFloat() const {
-        return jni::CallMethod<jni::jfloat>(env, value.get(), *java::Number::floatValueMethodId);
-    }
-
-    double Value::toDouble() const {
-        return jni::CallMethod<jni::jdouble>(env, value.get(), *java::Number::doubleValueMethodId);
-    }
-
-    long Value::toLong() const {
-        return jni::CallMethod<jni::jlong>(env, value.get(), *java::Number::longValueMethodId);
-    }
-
-    bool Value::toBool() const {
-        return jni::CallMethod<jni::jboolean>(env, value.get(), *java::Boolean::booleanValueMethodId);
-    }
-
-    Value Value::get(const char* key) const {
-        jni::jobject* member = jni::CallMethod<jni::jobject*>(env, value.get(), *java::Map::getMethodId, jni::Make<jni::String>(env, std::string(key)).get());
-        return Value(env, jni::Local<jni::Object<>>(env, member));
-    }
-
-    Value Value::keyArray() const{
-        jni::jobject* set = jni::CallMethod<jni::jobject*>(env, value.get(), *java::Map::keySetMethodId);
-        jni::jobject* array = jni::CallMethod<jni::jobject*>(env, set, *java::Set::toArrayMethodId);
-        return Value(env, jni::Local<jni::Object<>>(env, array));
-    }
-
-    int Value::getLength() const {
-        auto array = (jni::jarray<jni::jobject>*) value.get();
-        return jni::GetArrayLength(env, *array);
-    }
-
-    Value Value::get(const int index) const {
-        auto array = (jni::jarray<jni::jobject>*) value.get();
-        return Value(env, jni::Local<jni::Object<>>(env, jni::GetObjectArrayElement(env, *array, index)));
-    }
-}
-}
-
diff --git a/platform/android/src/style/value.hpp b/platform/android/src/style/value.hpp
deleted file mode 100644
index b507c5ed11..0000000000
--- a/platform/android/src/style/value.hpp
+++ /dev/null
@@ -1,43 +0,0 @@
-#pragma once
-
-#include <jni/jni.hpp>
-
-#include <string>
-
-namespace mbgl {
-namespace android {
-
-class Value {
-public:
-    Value(jni::JNIEnv&, jni::Local<jni::Object<>>);
-    Value(jni::JNIEnv&, const jni::Object<>&);
-
-    Value(Value&&)                 = default;
-    Value& operator=(Value&&)      = delete;
-
-    Value(const Value&)            = delete;
-    Value& operator=(const Value&) = delete;
-
-    bool isNull() const;
-    bool isArray() const;
-    bool isObject() const;
-    bool isString() const;
-    bool isBool() const;
-    bool isNumber() const;
-
-    std::string toString() const;
-    float toFloat() const;
-    double toDouble() const;
-    long toLong() const;
-    bool toBool() const;
-    Value get(const char* key) const;
-    Value keyArray() const;
-    int getLength() const;
-    Value get(const int index ) const;
-
-    jni::JNIEnv& env;
-    jni::Local<jni::Object<>> value;
-};
-
-}
-}
diff --git a/platform/android/src/text/local_glyph_rasterizer.cpp b/platform/android/src/text/local_glyph_rasterizer.cpp
deleted file mode 100644
index c65c3ae439..0000000000
--- a/platform/android/src/text/local_glyph_rasterizer.cpp
+++ /dev/null
@@ -1,131 +0,0 @@
-#include <mbgl/text/local_glyph_rasterizer.hpp>
-#include <mbgl/util/i18n.hpp>
-#include <mbgl/util/platform.hpp>
-
-#include <jni/jni.hpp>
-
-#include "../attach_env.hpp"
-#include "../bitmap.hpp"
-
-#include "local_glyph_rasterizer_jni.hpp"
-
-/*
-    Android implementation of LocalGlyphRasterizer:
-     Draws CJK glyphs using locally available fonts.
-
-    Follows pattern of GL JS implementation in that:
-     - Only CJK glyphs are drawn locally (because we can guess their metrics effectively)
-        * Render size/metrics determined experimentally using Noto Sans
-     - Configuration is done at map creation time by setting a "font family"
-        * JS uses a CSS font-family, this uses android.graphics.Typeface
-          https://developer.android.com/reference/android/graphics/Typeface.html
-     - We use heuristics to extract a font-weight based on the incoming font stack
-        * JS tries to extract multiple weights, this implementation only looks for
-          "bold"
-
-     mbgl::LocalGlyphRasterizer is the portable interface
-     mbgl::LocalGlyphRasterizer::Impl stores platform-specific configuration data
-     mbgl::android::LocalGlyphRasterizer is the JNI wrapper
-     com.mapbox.mapboxsdk.text.LocalGlyphRasterizer is the Java implementation that
-      actually does the drawing
- */
-
-namespace mbgl {
-namespace android {
-
-LocalGlyphRasterizer::LocalGlyphRasterizer() {
-    UniqueEnv env { AttachEnv() };
-
-    static auto& javaClass = jni::Class<LocalGlyphRasterizer>::Singleton(*env);
-    static auto constructor = javaClass.GetConstructor(*env);
-
-    javaObject = jni::NewGlobal(*env, javaClass.New(*env, constructor));
-}
-
-PremultipliedImage LocalGlyphRasterizer::drawGlyphBitmap(const std::string& fontFamily, const bool bold, const GlyphID glyphID) {
-    UniqueEnv env { AttachEnv() };
-
-    static auto& javaClass = jni::Class<LocalGlyphRasterizer>::Singleton(*env);
-    static auto drawGlyphBitmap = javaClass.GetMethod<jni::Object<Bitmap> (jni::String, jni::jboolean, jni::jchar)>(*env, "drawGlyphBitmap");
-
-    return Bitmap::GetImage(*env,
-        javaObject.Call(*env,
-            drawGlyphBitmap,
-            jni::Make<jni::String>(*env, fontFamily),
-            static_cast<jni::jboolean>(bold),
-            static_cast<jni::jchar>(glyphID)));
-}
-
-void LocalGlyphRasterizer::registerNative(jni::JNIEnv& env) {
-    jni::Class<LocalGlyphRasterizer>::Singleton(env);
-}
-
-} // namespace android
-
-class LocalGlyphRasterizer::Impl {
-public:
-    Impl(const optional<std::string> fontFamily_)
-        : fontFamily(fontFamily_)
-    {}
-
-    bool isConfigured() const {
-        return bool(fontFamily);
-    }
-
-    PremultipliedImage drawGlyphBitmap(const FontStack& fontStack, GlyphID glyphID) {
-        bool bold = false;
-        for (auto font : fontStack) {
-            std::string lowercaseFont = platform::lowercase(font);
-            if (lowercaseFont.find("bold") != std::string::npos) {
-                bold = true;
-                break;
-            }
-        }
-        return androidLocalGlyphRasterizer.drawGlyphBitmap(*fontFamily, bold, glyphID);
-    }
-
-private:
-    optional<std::string> fontFamily;
-    android::LocalGlyphRasterizer androidLocalGlyphRasterizer;
-};
-
-LocalGlyphRasterizer::LocalGlyphRasterizer(const optional<std::string>& fontFamily)
-    : impl(std::make_unique<Impl>(fontFamily)) {}
-
-LocalGlyphRasterizer::~LocalGlyphRasterizer()
-{}
-
-bool LocalGlyphRasterizer::canRasterizeGlyph(const FontStack&, GlyphID glyphID) {
-     return util::i18n::allowsFixedWidthGlyphGeneration(glyphID) && impl->isConfigured();
-}
-
-Glyph LocalGlyphRasterizer::rasterizeGlyph(const FontStack& fontStack, GlyphID glyphID) {
-    Glyph fixedMetrics;
-    if (!impl->isConfigured()) {
-        return fixedMetrics;
-    }
-
-    fixedMetrics.id = glyphID;
-
-    Size size(35, 35);
-
-    fixedMetrics.metrics.width = size.width;
-    fixedMetrics.metrics.height = size.height;
-    fixedMetrics.metrics.left = 3;
-    fixedMetrics.metrics.top = -10;
-    fixedMetrics.metrics.advance = 24;
-
-    PremultipliedImage rgbaBitmap = impl->drawGlyphBitmap(fontStack, glyphID);
-
-    // Copy alpha values from RGBA bitmap into the AlphaImage output
-    fixedMetrics.bitmap = AlphaImage(size);
-    for (uint32_t i = 0; i < size.width * size.height; i++) {
-        fixedMetrics.bitmap.data[i] =
-            0xff - round(0.2126 * rgbaBitmap.data[4 * i] + 0.7152 * rgbaBitmap.data[4 * i + 1] +
-                         0.0722 * rgbaBitmap.data[4 * i + 2]);
-    }
-
-    return fixedMetrics;
-}
-
-} // namespace mbgl
diff --git a/platform/android/src/text/local_glyph_rasterizer_jni.hpp b/platform/android/src/text/local_glyph_rasterizer_jni.hpp
deleted file mode 100644
index e80e848338..0000000000
--- a/platform/android/src/text/local_glyph_rasterizer_jni.hpp
+++ /dev/null
@@ -1,33 +0,0 @@
-#pragma once
-
-#include <mbgl/util/image.hpp>
-
-#include <jni/jni.hpp>
-
-/*
-    android::LocalGlyphRasterizer is the JNI wrapper of
-    com/mapbox/mapboxsdk/text/LocalGlyphRasterizer
-
-    mbgl::LocalGlyphRasterizer is the portable interface
-    Both implementations are in local_glyph_rasterizer.cpp
- */
-
-namespace mbgl {
-namespace android {
-
-class LocalGlyphRasterizer {
-public:
-    static constexpr auto Name() { return "com/mapbox/mapboxsdk/text/LocalGlyphRasterizer"; };
-
-    static void registerNative(jni::JNIEnv&);
-
-    LocalGlyphRasterizer();
-
-    PremultipliedImage drawGlyphBitmap(const std::string& fontFamily, const bool bold, const char16_t glyphID);
-
-private:
-    jni::Global<jni::Object<LocalGlyphRasterizer>> javaObject;
-};
-
-} // namespace android
-} // namespace mbgl