diff --git a/src/plugins/android/androidavdmanager.cpp b/src/plugins/android/androidavdmanager.cpp index 7ae088b496d..55ae7a5cdc6 100644 --- a/src/plugins/android/androidavdmanager.cpp +++ b/src/plugins/android/androidavdmanager.cpp @@ -74,7 +74,7 @@ bool AndroidAvdManager::avdManagerCommand(const AndroidConfig &config, const QSt Utils::SynchronousProcess proc; auto env = AndroidConfigurations::toolsEnvironment(config).toStringList(); proc.setEnvironment(env); - qCDebug(avdManagerLog) << "Running command:" << cmd.toUserOutput(); + qCDebug(avdManagerLog) << "Running AVD Manager command:" << cmd.toUserOutput(); SynchronousProcessResponse response = proc.runBlocking(cmd); if (response.result == Utils::SynchronousProcessResponse::Finished) { if (output) @@ -136,7 +136,7 @@ static CreateAvdInfo createAvdCommand(const AndroidConfig &config, const CreateA const QString avdManagerTool = config.avdManagerToolPath().toString(); qCDebug(avdManagerLog) - << "Running command:" << CommandLine(avdManagerTool, arguments).toUserOutput(); + << "Running AVD Manager command:" << CommandLine(avdManagerTool, arguments).toUserOutput(); QProcess proc; proc.start(avdManagerTool, arguments); if (!proc.waitForStarted()) { diff --git a/src/plugins/android/androidbuildapkstep.cpp b/src/plugins/android/androidbuildapkstep.cpp index 918b55866e5..317c5b9c5b2 100644 --- a/src/plugins/android/androidbuildapkstep.cpp +++ b/src/plugins/android/androidbuildapkstep.cpp @@ -190,7 +190,7 @@ bool AndroidBuildApkStep::init() m_packagePath = AndroidManager::apkPath(target()).toString(); } - qCDebug(buildapkstepLog) << "Package path:" << m_packagePath; + qCDebug(buildapkstepLog) << "APK or AAB path:" << m_packagePath; if (!AbstractProcessStep::init()) return false; diff --git a/src/plugins/android/androiddebugsupport.cpp b/src/plugins/android/androiddebugsupport.cpp index dc58202daa5..04ec22f66c0 100644 --- a/src/plugins/android/androiddebugsupport.cpp +++ b/src/plugins/android/androiddebugsupport.cpp @@ -122,8 +122,6 @@ void AndroidDebugSupport::start() setUseContinueInsteadOfRun(true); setAttachPid(m_runner->pid()); - qCDebug(androidDebugSupportLog) << "Start. Package name: " << packageName - << "PID: " << m_runner->pid().pid(); QtSupport::BaseQtVersion *qtVersion = QtSupport::QtKitAspect::qtVersion(kit); if (!Utils::HostOsInfo::isWindowsHost() && (qtVersion @@ -187,6 +185,8 @@ void AndroidDebugSupport::start() addSearchDirectory(qtVersion->qmlPath()); } + qCDebug(androidDebugSupportLog) << "Starting debugger - package name: " << packageName + << ", PID: " << m_runner->pid().pid(); DebuggerRunTool::start(); } diff --git a/src/plugins/android/androiddeployqtstep.cpp b/src/plugins/android/androiddeployqtstep.cpp index 176c8ebf7ba..cd83d0e66d5 100644 --- a/src/plugins/android/androiddeployqtstep.cpp +++ b/src/plugins/android/androiddeployqtstep.cpp @@ -209,7 +209,7 @@ bool AndroidDeployQtStep::init() m_avdName = info.avdname; m_serialNumber = info.serialNumber; - qCDebug(deployStepLog) << "Selected Device:" << info; + qCDebug(deployStepLog) << "Selected device info:" << info; gatherFilesToPull(); @@ -246,7 +246,6 @@ bool AndroidDeployQtStep::init() emit addOutput(tr("Cannot find the androiddeployqt tool."), OutputFormat::Stderr); return false; } - qCDebug(deployStepLog) << "Using androiddeployqt"; m_command = m_command.pathAppended(HostOsInfo::withExecutableSuffix("androiddeployqt")); 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/" + libDirName + "/libc.so"] = buildDir + "libc.so"; - qCDebug(deployStepLog) << "Files to pull from device:"; 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() diff --git a/src/plugins/android/androidmanager.cpp b/src/plugins/android/androidmanager.cpp index d00d275ae31..56726d774df 100644 --- a/src/plugins/android/androidmanager.cpp +++ b/src/plugins/android/androidmanager.cpp @@ -433,7 +433,7 @@ QString AndroidManager::deviceSerialNumber(const Target *target) 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->setNamedSettings(AndroidDeviceSn, deviceSerialNumber); } @@ -470,7 +470,7 @@ int AndroidManager::deviceApiLevel(const Target *target) 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->setNamedSettings(ApiLevelKey, level); } @@ -815,7 +815,7 @@ SdkToolResult AndroidManager::runCommand(const CommandLine &command, cmdResult.m_stdOut = response.stdOut().trimmed(); cmdResult.m_stdErr = response.stdErr().trimmed(); 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 << "Output:" << response.allRawOutput(); if (!cmdResult.success()) diff --git a/src/plugins/android/androidrunnerworker.cpp b/src/plugins/android/androidrunnerworker.cpp index 3d6042a2135..2c393ae1f0b 100644 --- a/src/plugins/android/androidrunnerworker.cpp +++ b/src/plugins/android/androidrunnerworker.cpp @@ -124,7 +124,6 @@ static qint64 extractPID(const QByteArray &output, const QString &packageName) static void findProcessPID(QFutureInterface &fi, QStringList selector, const QString &packageName, bool preNougat) { - qCDebug(androidRunWorkerLog) << "Finding PID. PreNougat:" << preNougat; if (packageName.isEmpty()) return; @@ -144,7 +143,7 @@ static void findProcessPID(QFutureInterface &fi, QStringList selector, } } while (processPID == -1 && !isTimedOut(start) && !fi.isCanceled()); - qCDebug(androidRunWorkerLog) << "PID found:" << processPID; + qCDebug(androidRunWorkerLog) << "PID found:" << processPID << ", PreNougat:" << preNougat; if (!fi.isCanceled()) fi.reportResult(processPID); } @@ -157,7 +156,6 @@ static void deleter(QProcess *p) p->kill(); p->waitForFinished(); } - qCDebug(androidRunWorkerLog) << "Done killing process:" << p->objectName(); // Might get deleted from its own signal handler. p->deleteLater(); } @@ -308,11 +306,11 @@ AndroidRunnerWorker::AndroidRunnerWorker(RunWorker *runner, const QString &packa m_debugServerPath = debugServer(m_useLldb, target).toString(); qCDebug(androidRunWorkerLog) << "Device Serial:" << m_deviceSerialNumber - << "API level:" << m_apiLevel - << "Extra Start Args:" << m_amStartExtraArgs - << "Before Start ADB cmds:" << m_beforeStartAdbCommands - << "After finish ADB cmds:" << m_afterFinishAdbCommands - << "Debug server path:" << m_debugServerPath; + << ", API level:" << m_apiLevel + << ", Extra Start Args:" << m_amStartExtraArgs + << ", Before Start ADB cmds:" << m_beforeStartAdbCommands + << ", After finish ADB cmds:" << m_afterFinishAdbCommands + << ", Debug server path:" << m_debugServerPath; QtSupport::BaseQtVersion *version = QtSupport::QtKitAspect::qtVersion(target->kit()); m_useAppParamsForQmlDebugger = version->qtVersion() >= QtSupport::QtVersionNumber(5, 12);