From dcf2f16384c74ebb2a2c6a233bca1fb4f2f085a1 Mon Sep 17 00:00:00 2001 From: Joni Poikelin Date: Tue, 16 Jun 2020 15:46:36 +0300 Subject: [PATCH] Fix debugging for x86 and armv7 Android builds Fixes: QTCREATORBUG-24191 Change-Id: I7b3033f47a4eb0f63be351576df1540e98edb903 Reviewed-by: hjk --- src/plugins/android/androiddeployqtstep.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/plugins/android/androiddeployqtstep.cpp b/src/plugins/android/androiddeployqtstep.cpp index 4debc3b755e..c908e121d47 100644 --- a/src/plugins/android/androiddeployqtstep.cpp +++ b/src/plugins/android/androiddeployqtstep.cpp @@ -447,8 +447,12 @@ bool AndroidDeployQtStep::runImpl() if (!m_filesToPull.isEmpty()) emit addOutput(tr("Pulling files necessary for debugging."), OutputFormat::NormalMessage); + // Note that values are not necessarily unique, e.g. app_process is looked up in several directories for (auto itr = m_filesToPull.constBegin(); itr != m_filesToPull.constEnd(); ++itr) { QFile::remove(itr.value()); + } + + for (auto itr = m_filesToPull.constBegin(); itr != m_filesToPull.constEnd(); ++itr) { runCommand({m_adbPath, AndroidDeviceInfo::adbSelector(m_serialNumber) << "pull" << itr.key() << itr.value()});