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

Android: Eliminate duplicated storage fields

Browse Source 
Change-Id: Id877b472f9b1916b5288ab36d770bd345385063a
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Jarek Kobus
2024-09-17 11:14:00 +02:00
parent 50959611f4
commit 8daab4886f
1 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -134,12 +134,11 @@ static FilePath debugServer(bool useLldb, const Target *target)
class RunnerStorage class RunnerStorage
{ {
public: public:
QStringList selector() const { return AndroidDeviceInfo::adbSelector(m_deviceSerialNumber); } bool isPreNougat() const { return m_glue->apiLevel() > 0 && m_glue->apiLevel() <= 23; }
bool isPreNougat() const { return m_apiLevel > 0 && m_apiLevel <= 23; }
Utils::CommandLine adbCommand(std::initializer_list<Utils::CommandLine::ArgRef> args) const Utils::CommandLine adbCommand(std::initializer_list<Utils::CommandLine::ArgRef> args) const
{ {
CommandLine cmd{AndroidConfig::adbToolPath(), args}; CommandLine cmd{AndroidConfig::adbToolPath(), args};
cmd.prependArgs(selector()); cmd.prependArgs(AndroidDeviceInfo::adbSelector(m_glue->deviceSerialNumber()));
return cmd; return cmd;
} }
QStringList userArgs() const QStringList userArgs() const
@@ -165,8 +164,6 @@ public:
bool m_useLldb = false; bool m_useLldb = false;
QmlDebug::QmlDebugServicesPreset m_qmlDebugServices; QmlDebug::QmlDebugServicesPreset m_qmlDebugServices;
QUrl m_qmlServer; QUrl m_qmlServer;
QString m_deviceSerialNumber; // TODO: remove
int m_apiLevel = -1; // TODO: remove
QString m_extraAppParams; QString m_extraAppParams;
Utils::Environment m_extraEnvVars; Utils::Environment m_extraEnvVars;
Utils::FilePath m_debugServerPath; // On build device, typically as part of ndk Utils::FilePath m_debugServerPath; // On build device, typically as part of ndk
@@ -206,11 +203,9 @@ static void setupStorage(RunnerStorage *storage, RunnerInterface *glue)
auto target = glue->runControl()->target(); auto target = glue->runControl()->target();
storage->m_packageName = AndroidManager::packageName(target); storage->m_packageName = AndroidManager::packageName(target);
storage->m_intentName = storage->m_packageName + '/' + AndroidManager::activityName(target); storage->m_intentName = storage->m_packageName + '/' + AndroidManager::activityName(target);
storage->m_deviceSerialNumber = glue->deviceSerialNumber();
storage->m_apiLevel = glue->apiLevel();
qCDebug(androidRunWorkerLog) << "Intent name:" << storage->m_intentName qCDebug(androidRunWorkerLog) << "Intent name:" << storage->m_intentName
<< "Package name:" << storage->m_packageName; << "Package name:" << storage->m_packageName;
qCDebug(androidRunWorkerLog) << "Device API:" << storage->m_apiLevel; qCDebug(androidRunWorkerLog) << "Device API:" << glue->apiLevel();
storage->m_extraEnvVars = glue->runControl()->aspectData<EnvironmentAspect>()->environment; storage->m_extraEnvVars = glue->runControl()->aspectData<EnvironmentAspect>()->environment;
qCDebug(androidRunWorkerLog).noquote() << "Environment variables for the app" qCDebug(androidRunWorkerLog).noquote() << "Environment variables for the app"
@@ -245,8 +240,8 @@ static void setupStorage(RunnerStorage *storage, RunnerInterface *glue)
} }
storage->m_debugServerPath = debugServer(storage->m_useLldb, target); storage->m_debugServerPath = debugServer(storage->m_useLldb, target);
qCDebug(androidRunWorkerLog).noquote() << "Device Serial:" << storage->m_deviceSerialNumber qCDebug(androidRunWorkerLog).noquote() << "Device Serial:" << glue->deviceSerialNumber()
<< ", API level:" << storage->m_apiLevel << ", API level:" << glue->apiLevel()
<< ", Extra Start Args:" << storage->m_amStartExtraArgs << ", Extra Start Args:" << storage->m_amStartExtraArgs
<< ", Before Start ADB cmds:" << storage->m_beforeStartAdbCommands << ", Before Start ADB cmds:" << storage->m_beforeStartAdbCommands
<< ", After finish ADB cmds:" << storage->m_afterFinishAdbCommands << ", After finish ADB cmds:" << storage->m_afterFinishAdbCommands