From 3d04efa0c8ebc5da5642a491f8f24677337b0b95 Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Mon, 11 May 2020 15:33:42 +0200
Subject: [PATCH] Android: Determine debugger type from Kit settings

Change-Id: I7e83fa1df923fd2449eecfac9c9d82bae249e6c1
Reviewed-by: David Schulz <david.schulz@qt.io>
---
 src/plugins/android/androidrunnerworker.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/plugins/android/androidrunnerworker.cpp b/src/plugins/android/androidrunnerworker.cpp
index cc5df2ff671..a25afb77c24 100644
--- a/src/plugins/android/androidrunnerworker.cpp
+++ b/src/plugins/android/androidrunnerworker.cpp
@@ -30,6 +30,7 @@
 #include "androidmanager.h"
 #include "androidrunconfiguration.h"
 
+#include <debugger/debuggerkitinformation.h>
 #include <debugger/debuggerrunconfigurationaspect.h>
 
 #include <projectexplorer/environmentaspect.h>
@@ -215,8 +216,9 @@ AndroidRunnerWorker::AndroidRunnerWorker(RunWorker *runner, const QString &packa
     , m_jdbProcess(nullptr, deleter)
 
 {
-    m_useLldb = qEnvironmentVariableIsSet("QTC_ANDROID_LLDB"); // FIXME: Determine from elsewhere
     auto runControl = runner->runControl();
+    m_useLldb = Debugger::DebuggerKitAspect::engineType(runControl->kit())
+                    == Debugger::LldbEngineType;
     auto aspect = runControl->aspect<Debugger::DebuggerRunConfigurationAspect>();
     Core::Id runMode = runControl->runMode();
     const bool debuggingMode = runMode == ProjectExplorer::Constants::DEBUG_RUN_MODE;