Android: Adapt to ProjectExplorer::ToolRunner introduction

Change-Id: I71cc25ef3daa0eee51a4c94285174e0f3b45d41f
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
Reviewed-by: hjk <hjk@qt.io>

1 files changed, 7 insertions, 9 deletions

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