From b8da47af9c8247e171a3baf29c125782fbebdad0 Mon Sep 17 00:00:00 2001 From: Vikas Pachdha Date: Tue, 17 Jul 2018 13:58:50 +0200 Subject: [PATCH] Android: Log Qt live apk path and few more code paths Change-Id: Id743db4865b399c619c04fc393540758352c60e1 Reviewed-by: Alessandro Portale --- src/plugins/android/androidconfigurations.cpp | 9 +++++++++ src/plugins/android/androidconfigurations.h | 2 ++ src/plugins/android/androiddeployqtstep.cpp | 12 +++++++++--- src/plugins/android/androiddevice.cpp | 7 +++++++ src/plugins/android/androidrunner.cpp | 1 + 5 files changed, 28 insertions(+), 3 deletions(-) diff --git a/src/plugins/android/androidconfigurations.cpp b/src/plugins/android/androidconfigurations.cpp index 4b9187bc5f5..c6c2447df5f 100644 --- a/src/plugins/android/androidconfigurations.cpp +++ b/src/plugins/android/androidconfigurations.cpp @@ -1287,4 +1287,13 @@ void AndroidConfigurations::updateAndroidDevice() AndroidConfigurations *AndroidConfigurations::m_instance = 0; +QDebug &operator<<(QDebug &stream, const AndroidDeviceInfo &device) +{ + stream << "Type:"<< (device.type == AndroidDeviceInfo::Emulator ? "Emulator" : "Device") + << ", ABI:" << device.cpuAbi << ", Serial:" << device.serialNumber + << ", Name:" << device.avdname << ", API:" << device.sdk + << ", Authorised:" << !device.unauthorized; + return stream; +} + } // namespace Android diff --git a/src/plugins/android/androidconfigurations.h b/src/plugins/android/androidconfigurations.h index 95de9aad65f..941fab7fbd5 100644 --- a/src/plugins/android/androidconfigurations.h +++ b/src/plugins/android/androidconfigurations.h @@ -229,6 +229,8 @@ private: bool m_force32bit; }; +QDebug &operator<<(QDebug &stream, const AndroidDeviceInfo &device); + } // namespace Android Q_DECLARE_METATYPE(Android::AndroidDeviceInfo) diff --git a/src/plugins/android/androiddeployqtstep.cpp b/src/plugins/android/androiddeployqtstep.cpp index 3e00c4a838e..f7e6a42c26f 100644 --- a/src/plugins/android/androiddeployqtstep.cpp +++ b/src/plugins/android/androiddeployqtstep.cpp @@ -123,6 +123,8 @@ bool AndroidDeployQtStep::init(QList &earlierSteps) return false; } + emit addOutput(tr("initializing deployment to Android device/simulator"), OutputFormat::Stdout); + RunConfiguration *rc = target()->activeRunConfiguration(); QTC_ASSERT(rc, return false); const bool deployQtLive = rc->id().name().startsWith(qmlProjectRunConfigIdName); @@ -135,10 +137,12 @@ bool AndroidDeployQtStep::init(QList &earlierSteps) return false; } - int deviceAPILevel = AndroidManager::minimumSDK(target()); + int minTargetApi = AndroidManager::minimumSDK(target()); + qCDebug(deployStepLog) << "Target architecture:" << m_targetArch + << "Min target API" << minTargetApi; AndroidDeviceInfo info = earlierDeviceInfo(earlierSteps, Id); if (!info.isValid()) { - info = AndroidConfigurations::showDeviceDialog(project(), deviceAPILevel, m_targetArch); + info = AndroidConfigurations::showDeviceDialog(project(), minTargetApi, m_targetArch); m_deviceInfo = info; // Keep around for later steps } @@ -147,7 +151,7 @@ bool AndroidDeployQtStep::init(QList &earlierSteps) m_avdName = info.avdname; m_serialNumber = info.serialNumber; - qCDebug(deployStepLog) << "AVD:" << m_avdName << "Device Serial:" << m_serialNumber; + qCDebug(deployStepLog) << "Selected Device:" << info; if (!deployQtLive) gatherFilesToPull(); @@ -155,6 +159,8 @@ bool AndroidDeployQtStep::init(QList &earlierSteps) AndroidManager::setDeviceSerialNumber(target(), m_serialNumber); AndroidManager::setDeviceApiLevel(target(), info.sdk); + emit addOutput(tr("Deploying to %1").arg(m_serialNumber), OutputFormat::Stdout); + QtSupport::BaseQtVersion *version = QtSupport::QtKitInformation::qtVersion(target()->kit()); if (!version) return false; diff --git a/src/plugins/android/androiddevice.cpp b/src/plugins/android/androiddevice.cpp index 7b9cc3a3de4..aefab39c2f0 100644 --- a/src/plugins/android/androiddevice.cpp +++ b/src/plugins/android/androiddevice.cpp @@ -34,9 +34,14 @@ #include #include +#include using namespace ProjectExplorer; +namespace { +Q_LOGGING_CATEGORY(androidDeviceLog, "qtc.android.build.androiddevice") +} + namespace Android { namespace Internal { @@ -51,6 +56,8 @@ AndroidDevice::AndroidDevice() QString activityPath; const AndroidConfig &config = AndroidConfigurations::currentConfig(); AndroidManager::apkInfo(config.qtLiveApkPath(), nullptr, nullptr, &activityPath); + qCDebug(androidDeviceLog) << "Using Qt live apk from: " << config.qtLiveApkPath() + << "Activity Path:" << activityPath; setQmlsceneCommand(activityPath); } diff --git a/src/plugins/android/androidrunner.cpp b/src/plugins/android/androidrunner.cpp index d5ed812ff8b..c7ad648240e 100644 --- a/src/plugins/android/androidrunner.cpp +++ b/src/plugins/android/androidrunner.cpp @@ -210,6 +210,7 @@ void AndroidRunner::qmlServerPortReady(Port port) serverUrl.setHost(QHostAddress(QHostAddress::LocalHost).toString()); serverUrl.setPort(port.number()); serverUrl.setScheme(urlTcpScheme()); + qCDebug(androidRunnerLog) << "Qml Server port ready"<< serverUrl; emit qmlServerReady(serverUrl); }