diff --git a/src/plugins/android/androidrunnerworker.cpp b/src/plugins/android/androidrunnerworker.cpp index b24b4814572..92b0f8f858b 100644 --- a/src/plugins/android/androidrunnerworker.cpp +++ b/src/plugins/android/androidrunnerworker.cpp @@ -8,6 +8,7 @@ #include "androidtr.h" #include "androidutils.h" +#include #include #include @@ -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//toolchains/llvm/prebuilt//bin/lldb + const FilePath prebuilt = debugger->command().parentDir().parentDir(); const QString abiNeedle = lldbServerArch2(preferredAbi); // The new, built-in LLDB.