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

Android: Remove lldb package handling via sdk_definitions.json

Browse Source 
The sdk_definitions.json only briefly listed an lldb package. There is
no need to still support that.

Amends: 6bea157c9b

Change-Id: I6344ea6ed9dd80693d02e86033632dfd2582b773
Reviewed-by: Artem Sokolovskii <artem.sokolovskii@qt.io>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
This commit is contained in:
Alessandro Portale
2023-01-06 13:17:00 +01:00
parent 1802ad77a7
commit a04b433489
1 changed files with 0 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -181,19 +181,6 @@ static FilePath debugServer(bool useLldb, const Target *target)
{{"lldb-server"}, dirFilter, QDirIterator::Subdirectories}); {{"lldb-server"}, dirFilter, QDirIterator::Subdirectories});
if (!lldbServer.isEmpty()) if (!lldbServer.isEmpty())
return lldbServer; return lldbServer;
// Older: Find LLDB version. sdk_definitions.json contains something like "lldb;3.1". Use that.
const QStringList packages = config.defaultEssentials();
for (const QString &package : packages) {
if (package.startsWith("lldb;")) {
const QString lldbVersion = package.mid(5);
const FilePath path = config.sdkLocation()
/ QString("lldb/%1/android/%2/lldb-server")
.arg(lldbVersion, lldbServerArch(preferredAbi));
if (path.exists())
return path;
}
}
} else { } else {
// Search suitable gdbserver binary. // Search suitable gdbserver binary.
const FilePath path = config.ndkLocation(qtVersion) const FilePath path = config.ndkLocation(qtVersion)