[android] - cleanup unused android binding c++ codeupstream/tvn-cleanup-binding-cpp

11 files changed, 0 insertions, 62 deletions

diff --git a/platform/android/src/android_renderer_frontend.hpp b/platform/android/src/android_renderer_frontend.hpp
index 107bbbe0b6..68c917b581 100644
--- a/platform/android/src/android_renderer_frontend.hpp
+++ b/platform/android/src/android_renderer_frontend.hpp
@@ -1,4 +1,3 @@
-
 #pragma once
 
 #include <mbgl/annotation/annotation.hpp>
diff --git a/platform/android/src/async_task.cpp b/platform/android/src/async_task.cpp
index 7b78eadb0c..2ba6ce3d8a 100644
--- a/platform/android/src/async_task.cpp
+++ b/platform/android/src/async_task.cpp
@@ -1,10 +1,6 @@
 #include "run_loop_impl.hpp"
 
 #include <mbgl/util/async_task.hpp>
-#include <mbgl/util/run_loop.hpp>
-
-#include <atomic>
-#include <functional>
 
 namespace mbgl {
 namespace util {
diff --git a/platform/android/src/connectivity_listener.cpp b/platform/android/src/connectivity_listener.cpp
index 5b1c0a86e4..68554d8977 100644
--- a/platform/android/src/connectivity_listener.cpp
+++ b/platform/android/src/connectivity_listener.cpp
@@ -1,9 +1,6 @@
 #include "connectivity_listener.hpp"
 
 #include <mbgl/storage/network_status.hpp>
-#include <mbgl/util/logging.hpp>
-
-#include <jni/jni.hpp>
 
 namespace mbgl {
 namespace android {
diff --git a/platform/android/src/http_file_source.cpp b/platform/android/src/http_file_source.cpp
index 8eb9416e9d..c7029feba6 100644
--- a/platform/android/src/http_file_source.cpp
+++ b/platform/android/src/http_file_source.cpp
@@ -1,7 +1,4 @@
 #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_task.hpp>
 #include <mbgl/util/util.hpp>
diff --git a/platform/android/src/image.cpp b/platform/android/src/image.cpp
index 2a33944b18..0b96c8aee7 100644
--- a/platform/android/src/image.cpp
+++ b/platform/android/src/image.cpp
@@ -1,8 +1,6 @@
 #include <mbgl/util/image.hpp>
 #include <mbgl/util/string.hpp>
 
-#include <string>
-
 #include "attach_env.hpp"
 #include "bitmap_factory.hpp"
 
diff --git a/platform/android/src/jni.cpp b/platform/android/src/jni.cpp
index f7d1e4afbc..728074c950 100755
--- a/platform/android/src/jni.cpp
+++ b/platform/android/src/jni.cpp
@@ -8,20 +8,16 @@
 #include "bitmap.hpp"
 #include "bitmap_factory.hpp"
 #include "connectivity_listener.hpp"
-#include "conversion/conversion.hpp"
 #include "conversion/collection.hpp"
 #include "file_source.hpp"
 #include "geojson/feature.hpp"
 #include "geojson/feature_collection.hpp"
-#include "geojson/geometry.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 "geojson/position.hpp"
-#include "geometry/lat_lng.hpp"
 #include "geometry/lat_lng_bounds.hpp"
 #include "geometry/lat_lng_quad.hpp"
 #include "geometry/projected_meters.hpp"
@@ -29,24 +25,16 @@
 #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 "native_map_view.hpp"
 #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"
-#include "style/transition_options.hpp"
 #include "style/functions/categorical_stops.hpp"
 #include "style/functions/exponential_stops.hpp"
 #include "style/functions/identity_stops.hpp"
 #include "style/functions/interval_stops.hpp"
-#include "style/functions/stop.hpp"
-#include "style/layers/layers.hpp"
-#include "style/sources/sources.hpp"
-#include "style/light.hpp"
 #include "snapshotter/map_snapshotter.hpp"
 
 namespace mbgl {
diff --git a/platform/android/src/jni.hpp b/platform/android/src/jni.hpp
index e5df92e701..45cc335811 100644
--- a/platform/android/src/jni.hpp
+++ b/platform/android/src/jni.hpp
@@ -2,7 +2,6 @@
 
 #include <string>
 
-typedef struct _jmethodID* jmethodID;
 typedef struct _JavaVM JavaVM;
 typedef struct _JNIEnv JNIEnv;
 
@@ -11,9 +10,6 @@ namespace android {
 
 extern JavaVM* theJVM;
 
-extern std::string cachePath;
-extern std::string dataPath;
-
 bool attach_jni_thread(JavaVM* vm, JNIEnv** env, std::string threadName);
 void detach_jni_thread(JavaVM* vm, JNIEnv** env, bool detach);
 
diff --git a/platform/android/src/native_map_view.cpp b/platform/android/src/native_map_view.cpp
index d859d929d3..ab8d7ddcf6 100755
--- a/platform/android/src/native_map_view.cpp
+++ b/platform/android/src/native_map_view.cpp
@@ -1,26 +1,13 @@
 #include "native_map_view.hpp"
 
-#include <cstdlib>
-#include <ctime>
-#include <cassert>
-#include <memory>
 #include <list>
-#include <tuple>
 
 #include <sys/system_properties.h>
 
-#include <EGL/egl.h>
 #include <android/native_window_jni.h>
 
-#include <jni/jni.hpp>
-
-#include <mbgl/renderer/backend_scope.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/shared_thread_pool.hpp>
 #include <mbgl/util/logging.hpp>
 #include <mbgl/util/platform.hpp>
@@ -32,7 +19,6 @@
 
 // Java -> C++ conversion
 #include "style/android_conversion.hpp"
-#include <mbgl/style/conversion.hpp>
 #include <mbgl/style/conversion/filter.hpp>
 
 // C++ -> Java conversion
@@ -43,13 +29,7 @@
 
 #include "jni.hpp"
 #include "attach_env.hpp"
-#include "android_renderer_frontend.hpp"
-#include "bitmap.hpp"
 #include "run_loop_impl.hpp"
-#include "java/util.hpp"
-#include "geometry/lat_lng_bounds.hpp"
-#include "map/camera_position.hpp"
-#include "style/light.hpp"
 #include "bitmap_factory.hpp"
 
 namespace mbgl {
diff --git a/platform/android/src/native_map_view.hpp b/platform/android/src/native_map_view.hpp
index 24c88f4e3f..c2941193b6 100755
--- a/platform/android/src/native_map_view.hpp
+++ b/platform/android/src/native_map_view.hpp
@@ -293,7 +293,6 @@ private:
     jni::UniqueWeakObject<NativeMapView> javaPeer;
 
     std::string styleUrl;
-    std::string apiKey;
 
     ANativeWindow *window = nullptr;
 
@@ -309,7 +308,6 @@ private:
     EGLSurface surface = EGL_NO_SURFACE;
     EGLContext context = EGL_NO_CONTEXT;
 
-
     float pixelRatio;
     bool fpsEnabled = false;
     bool snapshot = false;
diff --git a/platform/android/src/run_loop.cpp b/platform/android/src/run_loop.cpp
index dff7d1d984..53a337201c 100644
--- a/platform/android/src/run_loop.cpp
+++ b/platform/android/src/run_loop.cpp
@@ -4,17 +4,9 @@
 #include <mbgl/util/thread_local.hpp>
 #include <mbgl/util/thread.hpp>
 #include <mbgl/util/timer.hpp>
-#include <mbgl/actor/scheduler.hpp>
 
 #include <android/looper.h>
 
-#include <algorithm>
-#include <cassert>
-#include <functional>
-#include <memory>
-#include <stdexcept>
-#include <vector>
-
 #include <fcntl.h>
 #include <unistd.h>
 
diff --git a/platform/android/src/timer.cpp b/platform/android/src/timer.cpp
index 2d9ee49e9b..10851c5e76 100644
--- a/platform/android/src/timer.cpp
+++ b/platform/android/src/timer.cpp
@@ -1,10 +1,7 @@
 #include "run_loop_impl.hpp"
 
-#include <mbgl/util/run_loop.hpp>
 #include <mbgl/util/timer.hpp>
 
-#include <functional>
-
 namespace mbgl {
 namespace util {