Android: Use specific classes for run worker factories

Slimmer file interfaces.

Change-Id: I2cf846c04000eb29fe53219db9a97088b6b9a1aa
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>

src/plugins/android/androidruncontrol.cpp

@@ -3,6 +3,7 @@
 
 #include "androidruncontrol.h"
 
+#include "androidconstants.h"
 #include "androidglobal.h"
 #include "androidrunconfiguration.h"
 #include "androidrunner.h"
@@ -13,8 +14,18 @@
 
 using namespace ProjectExplorer;
 
-namespace Android {
-namespace Internal {
+namespace Android::Internal {
+
+class AndroidRunSupport final : public AndroidRunner
+{
+public:
+    explicit AndroidRunSupport(ProjectExplorer::RunControl *runControl,
+                               const QString &intentName = QString());
+    ~AndroidRunSupport() override;
+
+    void start() override;
+    void stop() override;
+};
 
 AndroidRunSupport::AndroidRunSupport(RunControl *runControl, const QString &intentName)
     : AndroidRunner(runControl, intentName)
@@ -37,5 +48,11 @@ void AndroidRunSupport::stop()
     AndroidRunner::stop();
 }
 
-} // namespace Internal
-} // namespace Android
+AndroidRunWorkerFactory::AndroidRunWorkerFactory()
+{
+    setProduct<AndroidRunSupport>();
+    addSupportedRunMode(ProjectExplorer::Constants::NORMAL_RUN_MODE);
+    addSupportedRunConfig(Constants::ANDROID_RUNCONFIG_ID);
+}
+
+} // Android::Internal