diff --git a/src/tools/androiddeployqt/main.cpp b/src/tools/androiddeployqt/main.cpp index 1a298614a87..4da8814bf6b 100644 --- a/src/tools/androiddeployqt/main.cpp +++ b/src/tools/androiddeployqt/main.cpp @@ -1762,10 +1762,15 @@ bool updateLibsXml(Options *options) QStringList localLibs; localLibs = options->localLibs[it.key()]; + const QString archSuffix = it.key() + ".so"_L1; + const QList& deps = options->qtDependencies[it.key()]; - auto notExistsInDependencies = [&deps] (const QString &lib) { + auto notExistsInDependencies = [&deps, archSuffix] (const QString &libName) { + QString lib = QFileInfo(libName).fileName(); + if (lib.endsWith(archSuffix)) + lib.chop(archSuffix.length()); return std::none_of(deps.begin(), deps.end(), [&lib] (const QtDependency &dep) { - return QFileInfo(dep.absolutePath).fileName() == QFileInfo(lib).fileName(); + return QFileInfo(dep.absolutePath).fileName().contains(lib); }); };