feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Android: Remove AndroidRunnable::amStartExtraArgs

Browse Source 
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>
This commit is contained in:
hjk
2018-05-15 10:08:16 +02:00
parent 7d97f4ce2d
commit cf01d20f95
4 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/android/androidrunnerworker.cpp
View File

@@ -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";