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

Android: FilePathify part of debugger abi detection

Browse Source 
Change-Id: I3abbc780c1e1301db4c6d367dcdf1dcf8cbf556d
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
hjk
2021-11-04 18:00:32 +01:00
parent b19f236c24
commit a7c8c97a68
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/android/androidmanager.cpp
View File

@@ -418,17 +418,18 @@ static QString preferredAbi(const QStringList &appAbis, const Target *target)
QString AndroidManager::apkDevicePreferredAbi(const Target *target) QString AndroidManager::apkDevicePreferredAbi(const Target *target)
{ {
auto libsPath = androidBuildDirectory(target).pathAppended("libs"); const FilePath libsPath = androidBuildDirectory(target).pathAppended("libs");
if (!libsPath.exists()) { if (!libsPath.exists()) {
if (const ProjectNode *node = currentProjectNode(target)) if (const ProjectNode *node = currentProjectNode(target))
return preferredAbi(node->data(Android::Constants::AndroidAbis).toStringList(), return preferredAbi(node->data(Android::Constants::AndroidAbis).toStringList(),
target); target);
} }
QStringList apkAbis; QStringList apkAbis;
const auto libsPaths = QDir{libsPath.toString()}.entryList(QDir::Dirs | QDir::NoDotAndDotDot); const FilePaths libsPaths = libsPath.dirEntries(QDir::Dirs | QDir::NoDotAndDotDot);
for (const auto &abi : libsPaths) for (const FilePath &abiDir : libsPaths) {
if (!QDir{libsPath.pathAppended(abi).toString()}.entryList(QStringList("*.so"), QDir::Files | QDir::NoDotAndDotDot).isEmpty()) if (!abiDir.dirEntries(QStringList("*.so"), QDir::Files | QDir::NoDotAndDotDot).isEmpty())
apkAbis << abi; apkAbis << abiDir.fileName();
}
return preferredAbi(apkAbis, target); return preferredAbi(apkAbis, target);
} }