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

Android: rephrase few logs

Browse Source 
Change-Id: If03a15c88caab210fd07c61312757317ea86af2f
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Assam Boudjelthia
2020-07-01 18:10:02 +03:00
parent b085091526
commit f936e7c10d
6 changed files with 16 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/android/androidavdmanager.cpp
View File

@@ -74,7 +74,7 @@ bool AndroidAvdManager::avdManagerCommand(const AndroidConfig &config, const QSt
Utils::SynchronousProcess proc; Utils::SynchronousProcess proc;
auto env = AndroidConfigurations::toolsEnvironment(config).toStringList(); auto env = AndroidConfigurations::toolsEnvironment(config).toStringList();
proc.setEnvironment(env); proc.setEnvironment(env);
qCDebug(avdManagerLog) << "Running command:" << cmd.toUserOutput(); qCDebug(avdManagerLog) << "Running AVD Manager command:" << cmd.toUserOutput();
SynchronousProcessResponse response = proc.runBlocking(cmd); SynchronousProcessResponse response = proc.runBlocking(cmd);
if (response.result == Utils::SynchronousProcessResponse::Finished) { if (response.result == Utils::SynchronousProcessResponse::Finished) {
if (output) if (output)
@@ -136,7 +136,7 @@ static CreateAvdInfo createAvdCommand(const AndroidConfig &config, const CreateA
const QString avdManagerTool = config.avdManagerToolPath().toString(); const QString avdManagerTool = config.avdManagerToolPath().toString();
qCDebug(avdManagerLog) qCDebug(avdManagerLog)
<< "Running command:" << CommandLine(avdManagerTool, arguments).toUserOutput(); << "Running AVD Manager command:" << CommandLine(avdManagerTool, arguments).toUserOutput();
QProcess proc; QProcess proc;
proc.start(avdManagerTool, arguments); proc.start(avdManagerTool, arguments);
if (!proc.waitForStarted()) { if (!proc.waitForStarted()) {

2
src/plugins/android/androidbuildapkstep.cpp
View File

@@ -190,7 +190,7 @@ bool AndroidBuildApkStep::init()
m_packagePath = AndroidManager::apkPath(target()).toString(); m_packagePath = AndroidManager::apkPath(target()).toString();
} }
qCDebug(buildapkstepLog) << "Package path:" << m_packagePath; qCDebug(buildapkstepLog) << "APK or AAB path:" << m_packagePath;
if (!AbstractProcessStep::init()) if (!AbstractProcessStep::init())
return false; return false;

4
src/plugins/android/androiddebugsupport.cpp
View File

@@ -122,8 +122,6 @@ void AndroidDebugSupport::start()
setUseContinueInsteadOfRun(true); setUseContinueInsteadOfRun(true);
setAttachPid(m_runner->pid()); setAttachPid(m_runner->pid());
qCDebug(androidDebugSupportLog) << "Start. Package name: " << packageName
<< "PID: " << m_runner->pid().pid();
QtSupport::BaseQtVersion *qtVersion = QtSupport::QtKitAspect::qtVersion(kit); QtSupport::BaseQtVersion *qtVersion = QtSupport::QtKitAspect::qtVersion(kit);
if (!Utils::HostOsInfo::isWindowsHost() if (!Utils::HostOsInfo::isWindowsHost()
&& (qtVersion && (qtVersion
@@ -187,6 +185,8 @@ void AndroidDebugSupport::start()
addSearchDirectory(qtVersion->qmlPath()); addSearchDirectory(qtVersion->qmlPath());
} }
qCDebug(androidDebugSupportLog) << "Starting debugger - package name: " << packageName
<< ", PID: " << m_runner->pid().pid();
DebuggerRunTool::start(); DebuggerRunTool::start();
} }

6
src/plugins/android/androiddeployqtstep.cpp
View File

@@ -209,7 +209,7 @@ bool AndroidDeployQtStep::init()
m_avdName = info.avdname; m_avdName = info.avdname;
m_serialNumber = info.serialNumber; m_serialNumber = info.serialNumber;
qCDebug(deployStepLog) << "Selected Device:" << info; qCDebug(deployStepLog) << "Selected device info:" << info;
gatherFilesToPull(); gatherFilesToPull();
@@ -246,7 +246,6 @@ bool AndroidDeployQtStep::init()
emit addOutput(tr("Cannot find the androiddeployqt tool."), OutputFormat::Stderr); emit addOutput(tr("Cannot find the androiddeployqt tool."), OutputFormat::Stderr);
return false; return false;
} }
qCDebug(deployStepLog) << "Using androiddeployqt";
m_command = m_command.pathAppended(HostOsInfo::withExecutableSuffix("androiddeployqt")); m_command = m_command.pathAppended(HostOsInfo::withExecutableSuffix("androiddeployqt"));
m_workingDirectory = bc->buildDirectory().pathAppended(Constants::ANDROID_BUILDDIRECTORY); m_workingDirectory = bc->buildDirectory().pathAppended(Constants::ANDROID_BUILDDIRECTORY);
@@ -497,9 +496,8 @@ void AndroidDeployQtStep::gatherFilesToPull()
m_filesToPull["/system/bin/" + linkerName] = buildDir + linkerName; m_filesToPull["/system/bin/" + linkerName] = buildDir + linkerName;
m_filesToPull["/system/" + libDirName + "/libc.so"] = buildDir + "libc.so"; m_filesToPull["/system/" + libDirName + "/libc.so"] = buildDir + "libc.so";
qCDebug(deployStepLog) << "Files to pull from device:";
for (auto itr = m_filesToPull.constBegin(); itr != m_filesToPull.constEnd(); ++itr) for (auto itr = m_filesToPull.constBegin(); itr != m_filesToPull.constEnd(); ++itr)
qCDebug(deployStepLog) << itr.key() << "to" << itr.value(); qCDebug(deployStepLog) << "Pulling file from device:" << itr.key() << "to:" << itr.value();
} }
void AndroidDeployQtStep::doRun() void AndroidDeployQtStep::doRun()

6
src/plugins/android/androidmanager.cpp
View File

@@ -433,7 +433,7 @@ QString AndroidManager::deviceSerialNumber(const Target *target)
void AndroidManager::setDeviceSerialNumber(Target *target, const QString &deviceSerialNumber) void AndroidManager::setDeviceSerialNumber(Target *target, const QString &deviceSerialNumber)
{ {
qCDebug(androidManagerLog) << "Device serial for the target changed" qCDebug(androidManagerLog) << "Target device serial changed:"
<< target->displayName() << deviceSerialNumber; << target->displayName() << deviceSerialNumber;
target->setNamedSettings(AndroidDeviceSn, deviceSerialNumber); target->setNamedSettings(AndroidDeviceSn, deviceSerialNumber);
} }
@@ -470,7 +470,7 @@ int AndroidManager::deviceApiLevel(const Target *target)
void AndroidManager::setDeviceApiLevel(Target *target, int level) void AndroidManager::setDeviceApiLevel(Target *target, int level)
{ {
qCDebug(androidManagerLog) << "Device API level for the target changed" qCDebug(androidManagerLog) << "Target device API level changed:"
<< target->displayName() << level; << target->displayName() << level;
target->setNamedSettings(ApiLevelKey, level); target->setNamedSettings(ApiLevelKey, level);
} }
@@ -815,7 +815,7 @@ SdkToolResult AndroidManager::runCommand(const CommandLine &command,
cmdResult.m_stdOut = response.stdOut().trimmed(); cmdResult.m_stdOut = response.stdOut().trimmed();
cmdResult.m_stdErr = response.stdErr().trimmed(); cmdResult.m_stdErr = response.stdErr().trimmed();
cmdResult.m_success = response.result == SynchronousProcessResponse::Finished; cmdResult.m_success = response.result == SynchronousProcessResponse::Finished;
qCDebug(androidManagerLog) << "Running command (sync) finshed:" << command.toUserOutput() qCDebug(androidManagerLog) << "Command finshed (sync):" << command.toUserOutput()
<< "Success:" << cmdResult.m_success << "Success:" << cmdResult.m_success
<< "Output:" << response.allRawOutput(); << "Output:" << response.allRawOutput();
if (!cmdResult.success()) if (!cmdResult.success())

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

@@ -124,7 +124,6 @@ static qint64 extractPID(const QByteArray &output, const QString &packageName)
static void findProcessPID(QFutureInterface<qint64> &fi, QStringList selector, static void findProcessPID(QFutureInterface<qint64> &fi, QStringList selector,
const QString &packageName, bool preNougat) const QString &packageName, bool preNougat)
{ {
qCDebug(androidRunWorkerLog) << "Finding PID. PreNougat:" << preNougat;
if (packageName.isEmpty()) if (packageName.isEmpty())
return; return;
@@ -144,7 +143,7 @@ static void findProcessPID(QFutureInterface<qint64> &fi, QStringList selector,
} }
} while (processPID == -1 && !isTimedOut(start) && !fi.isCanceled()); } while (processPID == -1 && !isTimedOut(start) && !fi.isCanceled());
qCDebug(androidRunWorkerLog) << "PID found:" << processPID; qCDebug(androidRunWorkerLog) << "PID found:" << processPID << ", PreNougat:" << preNougat;
if (!fi.isCanceled()) if (!fi.isCanceled())
fi.reportResult(processPID); fi.reportResult(processPID);
} }
@@ -157,7 +156,6 @@ static void deleter(QProcess *p)
p->kill(); p->kill();
p->waitForFinished(); p->waitForFinished();
} }
qCDebug(androidRunWorkerLog) << "Done killing process:" << p->objectName();
// Might get deleted from its own signal handler. // Might get deleted from its own signal handler.
p->deleteLater(); p->deleteLater();
} }
@@ -308,11 +306,11 @@ AndroidRunnerWorker::AndroidRunnerWorker(RunWorker *runner, const QString &packa
m_debugServerPath = debugServer(m_useLldb, target).toString(); m_debugServerPath = debugServer(m_useLldb, target).toString();
qCDebug(androidRunWorkerLog) << "Device Serial:" << m_deviceSerialNumber qCDebug(androidRunWorkerLog) << "Device Serial:" << m_deviceSerialNumber
<< "API level:" << m_apiLevel << ", API level:" << m_apiLevel
<< "Extra Start Args:" << m_amStartExtraArgs << ", Extra Start Args:" << m_amStartExtraArgs
<< "Before Start ADB cmds:" << m_beforeStartAdbCommands << ", Before Start ADB cmds:" << m_beforeStartAdbCommands
<< "After finish ADB cmds:" << m_afterFinishAdbCommands << ", After finish ADB cmds:" << m_afterFinishAdbCommands
<< "Debug server path:" << m_debugServerPath; << ", Debug server path:" << m_debugServerPath;
QtSupport::BaseQtVersion *version = QtSupport::QtKitAspect::qtVersion(target->kit()); QtSupport::BaseQtVersion *version = QtSupport::QtKitAspect::qtVersion(target->kit());
m_useAppParamsForQmlDebugger = version->qtVersion() >= QtSupport::QtVersionNumber(5, 12); m_useAppParamsForQmlDebugger = version->qtVersion() >= QtSupport::QtVersionNumber(5, 12);