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

Debugger: Fix running android lldb

Browse Source 
..when gathering version information.

Change-Id: I99d69de661edad856fe66a045e8e2ee03036dd2c
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Christian Stenger
2021-11-08 11:44:10 +01:00
parent 39d2fc91fd
commit 50b2395804
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/plugins/debugger/debuggeritem.cpp
View File

@@ -144,6 +144,8 @@ void DebuggerItem::createId()
void DebuggerItem::reinitializeFromFile(const Environment &sysEnv, QString *error) void DebuggerItem::reinitializeFromFile(const Environment &sysEnv, QString *error)
{ {
const bool isAndroid = m_command.path().contains("/ndk/")
|| m_command.path().contains("/ndk-bundle/");
// CDB only understands the single-dash -version, whereas GDB and LLDB are // CDB only understands the single-dash -version, whereas GDB and LLDB are
// happy with both -version and --version. So use the "working" -version // happy with both -version and --version. So use the "working" -version
// except for the experimental LLDB-MI which insists on --version. // except for the experimental LLDB-MI which insists on --version.
@@ -167,7 +169,8 @@ void DebuggerItem::reinitializeFromFile(const Environment &sysEnv, QString *erro
// Prevent calling lldb on Windows because the lldb from the llvm package is linked against // Prevent calling lldb on Windows because the lldb from the llvm package is linked against
// python but does not contain a python dll. // python but does not contain a python dll.
if (HostOsInfo::isWindowsHost() && m_command.fileName().startsWith("lldb")) { if (HostOsInfo::isWindowsHost() && m_command.fileName().startsWith("lldb")
&& !isAndroid) {
QString errorMessage; QString errorMessage;
m_version = winGetDLLVersion(WinDLLFileVersion, m_version = winGetDLLVersion(WinDLLFileVersion,
m_command.absoluteFilePath().path(), m_command.absoluteFilePath().path(),
@@ -177,8 +180,18 @@ void DebuggerItem::reinitializeFromFile(const Environment &sysEnv, QString *erro
return; return;
} }
Environment env = sysEnv.toProcessEnvironment().isEmpty() ? Environment::systemEnvironment()
: sysEnv;
if (isAndroid && m_command.fileName().startsWith("lldb")) {
FilePath pythonPath = m_command.parentDir().parentDir().pathAppended("python3");
if (HostOsInfo::isAnyUnixHost())
pythonPath = pythonPath.pathAppended("bin");
if (pythonPath.exists())
env.prependOrSetPath(pythonPath.toUserOutput());
}
QtcProcess proc; QtcProcess proc;
proc.setEnvironment(sysEnv); proc.setEnvironment(env);
proc.setCommand({m_command, {version}}); proc.setCommand({m_command, {version}});
proc.runBlocking(); proc.runBlocking();
const QString output = proc.allOutput().trimmed(); const QString output = proc.allOutput().trimmed();