Debugger: Remove DebuggerRunControl

Use plain RunControl + DebuggerRunTool combo instead.

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

1 files changed, 5 insertions, 6 deletions

diff --git a/src/plugins/android/androiddebugsupport.h b/src/plugins/android/androiddebugsupport.h
index 1dba6e7d70..8e07216901 100644
--- a/src/plugins/android/androiddebugsupport.h
+++ b/src/plugins/android/androiddebugsupport.h
@@ -25,30 +25,29 @@
 
 #pragma once
 
-#include <projectexplorer/runconfiguration.h>
+#include <debugger/debuggerruncontrol.h>
 
 #include "androidrunconfiguration.h"
 
-namespace Debugger { class DebuggerRunControl; }
-
 namespace Android {
 namespace Internal {
 
 class AndroidRunner;
 
-class AndroidDebugSupport : public ProjectExplorer::ToolRunner
+class AndroidDebugSupport : public Debugger::DebuggerRunTool
 {
     Q_OBJECT
 
 public:
-    explicit AndroidDebugSupport(ProjectExplorer::RunControl *runControl);
+    AndroidDebugSupport(ProjectExplorer::RunControl *runControl,
+                        const Debugger::DebuggerStartParameters &sp,
+                        QString *errorMessage);
 
     static ProjectExplorer::RunControl *createDebugRunControl(ProjectExplorer::RunConfiguration *runConfig,
                                                               QString *errorMessage);
 
 private:
     void handleRemoteProcessStarted(Utils::Port gdbServerPort, Utils::Port qmlPort);
-    Debugger::DebuggerRunControl *runControl();
 
     AndroidRunner * const m_runner;
 };