Android: Convert into a RunWorker based setup

This moves all of the RunControl implementation into a single
RunWorker, not yet splitting it up into separate RunWorkers
which is the final goal of this series.

Change-Id: I7373105603505aa4fffd7fe5ff0145f0128b34bc
Reviewed-by: Christian Stenger <christian.stenger@qt.io>

1 files changed, 5 insertions, 12 deletions

diff --git a/src/plugins/android/androiddebugsupport.h b/src/plugins/android/androiddebugsupport.h
index 8e07216901..7486e537ae 100644
--- a/src/plugins/android/androiddebugsupport.h
+++ b/src/plugins/android/androiddebugsupport.h
@@ -25,31 +25,24 @@
 
 #pragma once
 
+#include "androidrunner.h"
 #include <debugger/debuggerruncontrol.h>
 
-#include "androidrunconfiguration.h"
-
 namespace Android {
 namespace Internal {
 
-class AndroidRunner;
-
 class AndroidDebugSupport : public Debugger::DebuggerRunTool
 {
     Q_OBJECT
 
 public:
-    AndroidDebugSupport(ProjectExplorer::RunControl *runControl,
-                        const Debugger::DebuggerStartParameters &sp,
-                        QString *errorMessage);
+    AndroidDebugSupport(ProjectExplorer::RunControl *runControl);
 
-    static ProjectExplorer::RunControl *createDebugRunControl(ProjectExplorer::RunConfiguration *runConfig,
-                                                              QString *errorMessage);
+    void start() override;
+    void stop() override;
 
 private:
-    void handleRemoteProcessStarted(Utils::Port gdbServerPort, Utils::Port qmlPort);
-
-    AndroidRunner * const m_runner;
+    AndroidRunner *m_runner = nullptr;
 };
 
 } // namespace Internal