From aaf2318a19799bbbc15f925022bddf57f4b1c28f Mon Sep 17 00:00:00 2001 From: BogDan Vatra Date: Wed, 22 Jun 2022 15:15:48 +0300 Subject: [PATCH] Fix Android debugging - gatherFilesToPull depends on AndroidManager::setDeviceAbis - use the same path for app_process. gatherFilesToPull pulls app_process to AndroidManager::buildDirectory(target) which might be different than activeRunConfig->buildTargetInfo().workingDirectory. Change-Id: Id47c4380fed5a8b3ad922359e5f9f25e529bacff Reviewed-by: hjk --- src/plugins/android/androiddebugsupport.cpp | 4 ++-- src/plugins/android/androiddeployqtstep.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/plugins/android/androiddebugsupport.cpp b/src/plugins/android/androiddebugsupport.cpp index c92ec6af462..055c8d8f8fc 100644 --- a/src/plugins/android/androiddebugsupport.cpp +++ b/src/plugins/android/androiddebugsupport.cpp @@ -140,10 +140,10 @@ void AndroidDebugSupport::start() solibSearchPath.append(qtVersion->qtSoPaths()); solibSearchPath.append(uniquePaths(extraLibs)); + FilePath buildDir = AndroidManager::buildDirectory(target); const RunConfiguration *activeRunConfig = target->activeRunConfiguration(); - FilePath buildDir; if (activeRunConfig) - buildDir = activeRunConfig->buildTargetInfo().workingDirectory; + solibSearchPath.append(activeRunConfig->buildTargetInfo().workingDirectory.toString()); solibSearchPath.append(buildDir.toString()); solibSearchPath.removeDuplicates(); setSolibSearchPath(solibSearchPath); diff --git a/src/plugins/android/androiddeployqtstep.cpp b/src/plugins/android/androiddeployqtstep.cpp index 104d1151a04..a8b8124fd9c 100644 --- a/src/plugins/android/androiddeployqtstep.cpp +++ b/src/plugins/android/androiddeployqtstep.cpp @@ -213,12 +213,12 @@ bool AndroidDeployQtStep::init() m_serialNumber = info.serialNumber; qCDebug(deployStepLog) << "Selected device info:" << info; - gatherFilesToPull(); - AndroidManager::setDeviceSerialNumber(target(), m_serialNumber); AndroidManager::setDeviceApiLevel(target(), info.sdk); AndroidManager::setDeviceAbis(target(), info.cpuAbi); + gatherFilesToPull(); + emit addOutput(tr("Deploying to %1").arg(m_serialNumber), OutputFormat::NormalMessage); m_uninstallPreviousPackageRun = m_uninstallPreviousPackage->value();