Android: Remove AndroidRunnable::amStartExtraArgs

It was only set up in AndroidRunner from the run configuration
and passed to AndroidRunnerWorker, instead get in in the
AndroidRunnerWorker from the run configuration directly.

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

src/plugins/android/androidrunnable.h

@@ -34,7 +34,6 @@ struct ANDROID_EXPORT AndroidRunnable
 {
     AndroidRunnable();
     QString packageName;
-    QStringList amStartExtraArgs;
     QStringList beforeStartAdbCommands;
     QStringList afterFinishAdbCommands;
 
@@ -45,7 +44,6 @@ struct ANDROID_EXPORT AndroidRunnable
 inline bool operator==(const AndroidRunnable &r1, const AndroidRunnable &r2)
 {
     return r1.packageName == r2.packageName
-        && r1.amStartExtraArgs == r2.amStartExtraArgs
         && r1.beforeStartAdbCommands == r2.beforeStartAdbCommands
         && r1.afterFinishAdbCommands == r2.afterFinishAdbCommands;
 }

src/plugins/android/androidrunner.cpp

@@ -131,9 +131,6 @@ AndroidRunner::AndroidRunner(RunControl *runControl,
     m_androidRunnable.packageName = intent.left(intent.indexOf('/'));
 
     RunConfiguration *rc = runControl->runConfiguration();
-    if (auto aspect = rc->extraAspect(Constants::ANDROID_AMSTARTARGS_ASPECT))
-        m_androidRunnable.amStartExtraArgs = static_cast<BaseStringAspect *>(aspect)->value().split(' ');
-
     if (auto aspect = rc->extraAspect(Constants::ANDROID_PRESTARTSHELLCMDLIST_ASPECT)) {
         for (QString shellCmd : static_cast<BaseStringListAspect *>(aspect)->value())
             m_androidRunnable.beforeStartAdbCommands.append(QString("shell %1").arg(shellCmd));

src/plugins/android/androidrunnerworker.cpp

@@ -23,11 +23,12 @@
 **
 ****************************************************************************/
 
-#include "androidconfigurations.h"
-#include "androidmanager.h"
 #include "androidrunnerworker.h"
 
-#include <QThread>
+#include "androidconfigurations.h"
+#include "androidconstants.h"
+#include "androidmanager.h"
+#include "androidrunconfiguration.h"
 
 #include <debugger/debuggerrunconfigurationaspect.h>
 #include <projectexplorer/target.h>
@@ -40,6 +41,8 @@
 #include <utils/url.h>
 
 #include <QTcpServer>
+#include <QThread>
+
 #include <chrono>
 
 using namespace std;
@@ -177,6 +180,9 @@ AndroidRunnerWorker::AndroidRunnerWorker(RunControl *runControl, const AndroidRu
     auto target = runConfig->target();
     m_deviceSerialNumber = AndroidManager::deviceSerialNumber(target);
     m_apiLevel = AndroidManager::deviceApiLevel(target);
+
+    if (auto aspect = runConfig->extraAspect(Constants::ANDROID_AMSTARTARGS_ASPECT))
+        m_amStartExtraArgs = static_cast<BaseStringAspect *>(aspect)->value().split(' ');
 }
 
 AndroidRunnerWorker::~AndroidRunnerWorker()
@@ -344,7 +350,7 @@ void AndroidRunnerWorker::asyncStartHelper()
         runAdb(entry.split(' ', QString::SkipEmptyParts));
 
     QStringList args({"shell", "am", "start"});
-    args << m_androidRunnable.amStartExtraArgs;
+    args << m_amStartExtraArgs;
     args << "-n" << m_intentName;
     if (m_useCppDebugger) {
         args << "-D";

src/plugins/android/androidrunnerworker.h

@@ -92,6 +92,7 @@ protected:
     AndroidRunnable m_androidRunnable;
     QString m_intentName;
     QString m_adb;
+    QStringList m_amStartExtraArgs;
     qint64 m_processPID = -1;
     std::unique_ptr<QProcess, Deleter> m_adbLogcatProcess;
     std::unique_ptr<QProcess, Deleter> m_psIsAlive;