1 files changed, 9 insertions, 11 deletions
diff --git a/platform/android/src/android_renderer_frontend.hpp b/platform/android/src/android_renderer_frontend.hpp
index 107bbbe0b6..94508fd816 100644
--- a/platform/android/src/android_renderer_frontend.hpp
+++ b/platform/android/src/android_renderer_frontend.hpp
@@ -1,19 +1,20 @@
-
 #pragma once
 
+#include <mbgl/actor/actor.hpp>
 #include <mbgl/annotation/annotation.hpp>
-#include <mbgl/renderer/renderer_backend.hpp>
 #include <mbgl/renderer/renderer_frontend.hpp>
-#include <mbgl/util/async_task.hpp>
 #include <mbgl/util/geo.hpp>
+#include <mbgl/util/run_loop.hpp>
 
 #include <functional>
 #include <memory>
 #include <vector>
+#include <string>
+
+#include "map_renderer.hpp"
 
 namespace mbgl {
 
-class Renderer;
 class RenderedQueryOptions;
 class SourceQueryOptions;
 
@@ -21,15 +22,14 @@ namespace android {
 
 class AndroidRendererFrontend : public RendererFrontend {
 public:
-    using InvalidateCallback = std::function<void ()>;
-    AndroidRendererFrontend(std::unique_ptr<Renderer>, RendererBackend&, InvalidateCallback);
+
+    AndroidRendererFrontend(MapRenderer&);
     ~AndroidRendererFrontend() override;
 
     void reset() override;
     void setObserver(RendererObserver&) override;
 
     void update(std::shared_ptr<UpdateParameters>) override;
-    void render();
 
     // Feature querying
     std::vector<Feature> queryRenderedFeatures(const ScreenCoordinate&, const RenderedQueryOptions&) const;
@@ -41,10 +41,8 @@ public:
     void onLowMemory();
 
 private:
-    std::unique_ptr<Renderer> renderer;
-    RendererBackend& backend;
-    std::shared_ptr<UpdateParameters> updateParameters;
-    util::AsyncTask asyncInvalidate;
+    MapRenderer& mapRenderer;
+    util::RunLoop* mapRunLoop;
 };
 
 } // namespace android