feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Android: Use lldb-server from the host lldb debugger path

Browse Source 
We want to have the lldb-server, matching the target ABI, from the NDK
path from where we have the host lldb debugger.

The previous version would take into consideration the default NDK if
set, or the NDK version used to build Qt.

Fixes: QTCREATORBUG-32494
Change-Id: Ibd1b4898052641a58a145d85181ae366800b3616
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
This commit is contained in:
Cristian Adam
2025-02-12 20:39:19 +01:00
parent 7203730049
commit 633e72f846
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/android/androidrunnerworker.cpp
View File

@@ -8,6 +8,7 @@
#include "androidtr.h"
#include "androidutils.h"
#include <debugger/debuggeritem.h>
#include <debugger/debuggerkitaspect.h>
#include <debugger/debuggerrunconfigurationaspect.h>
@@ -41,6 +42,7 @@ static Q_LOGGING_CATEGORY(androidRunWorkerLog, "qtc.android.run.androidrunnerwor
static const int GdbTempFileMaxCounter = 20;
}
using namespace Debugger;
using namespace ProjectExplorer;
using namespace Tasking;
using namespace Utils;
@@ -102,7 +104,11 @@ static FilePath debugServer(bool useLldb, const Target *target)
if (useLldb) {
// Search suitable lldb-server binary.
const FilePath prebuilt = AndroidConfig::ndkLocation(qtVersion) / "toolchains/llvm/prebuilt";
const DebuggerItem *debugger = DebuggerKitAspect::debugger(target->kit());
if (!debugger || debugger->command().isEmpty())
return {};
// .../ndk/<ndk-version>/toolchains/llvm/prebuilt/<host-arch>/bin/lldb
const FilePath prebuilt = debugger->command().parentDir().parentDir();
const QString abiNeedle = lldbServerArch2(preferredAbi);
// The new, built-in LLDB.