From ce95e31766e441698486fea0258e16395c829c80 Mon Sep 17 00:00:00 2001 From: BogDan Vatra Date: Tue, 3 Dec 2019 09:26:05 +0200 Subject: [PATCH] Fix debugging armv7a & x86 when running on 64 bit targets We need to choose the preferred ABI based on what it's in the package not based on what Qt supports. Change-Id: I243fbf67913af7804af868d507323c0934ad3752 Reviewed-by: Cristian Adam --- src/plugins/android/androiddebugsupport.cpp | 2 +- src/plugins/android/androiddeployqtstep.cpp | 2 +- src/plugins/android/androidmanager.cpp | 5 ----- src/plugins/android/androidmanager.h | 1 - 4 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/plugins/android/androiddebugsupport.cpp b/src/plugins/android/androiddebugsupport.cpp index dce03b052cb..c7e93d52e1b 100644 --- a/src/plugins/android/androiddebugsupport.cpp +++ b/src/plugins/android/androiddebugsupport.cpp @@ -145,7 +145,7 @@ void AndroidDebugSupport::start() setSymbolFile(runControl()->buildDirectory().pathAppended("app_process")); setSkipExecutableValidation(true); setUseExtendedRemote(true); - QString devicePreferredAbi = AndroidManager::devicePreferredAbi(target); + QString devicePreferredAbi = AndroidManager::apkDevicePreferredAbi(target); setAbi(AndroidManager::androidAbi2Abi(devicePreferredAbi)); QUrl gdbServer; gdbServer.setHost(QHostAddress(QHostAddress::LocalHost).toString()); diff --git a/src/plugins/android/androiddeployqtstep.cpp b/src/plugins/android/androiddeployqtstep.cpp index fe6e2f30b5d..451fb48ba56 100644 --- a/src/plugins/android/androiddeployqtstep.cpp +++ b/src/plugins/android/androiddeployqtstep.cpp @@ -509,7 +509,7 @@ void AndroidDeployQtStep::gatherFilesToPull() QString linkerName("linker"); QString libDirName("lib"); - auto preferreABI = AndroidManager::devicePreferredAbi(target()); + auto preferreABI = AndroidManager::apkDevicePreferredAbi(target()); if (preferreABI == "arm64-v8a" || preferreABI == "x86_64") { m_filesToPull["/system/bin/app_process64"] = buildDir + "app_process"; libDirName = "lib64"; diff --git a/src/plugins/android/androidmanager.cpp b/src/plugins/android/androidmanager.cpp index cae47d4d4b6..14b5ef2050e 100644 --- a/src/plugins/android/androidmanager.cpp +++ b/src/plugins/android/androidmanager.cpp @@ -433,11 +433,6 @@ static QString preferredAbi(const QStringList &appAbis, Target *target) return {}; } -QString AndroidManager::devicePreferredAbi(Target *target) -{ - return preferredAbi(applicationAbis(target), target); -} - QString AndroidManager::apkDevicePreferredAbi(Target *target) { auto libsPath = dirPath(target).pathAppended("libs"); diff --git a/src/plugins/android/androidmanager.h b/src/plugins/android/androidmanager.h index cb0958a0401..49fc786b5fe 100644 --- a/src/plugins/android/androidmanager.h +++ b/src/plugins/android/androidmanager.h @@ -84,7 +84,6 @@ public: static QString deviceSerialNumber(ProjectExplorer::Target *target); static void setDeviceSerialNumber(ProjectExplorer::Target *target, const QString &deviceSerialNumber); - static QString devicePreferredAbi(ProjectExplorer::Target *target); static QString apkDevicePreferredAbi(ProjectExplorer::Target *target); static void setDeviceAbis(ProjectExplorer::Target *target, const QStringList &deviceAbis);