1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Android: Fix for multi-ABI build in androiddeployqt

Browse Source 
7499fd0229d63f969bf6ca58d3b764b96395bed2 commit cleans up the localLibs
to not add dependencies to the libs.xml file as they will not be
satisfied.

Mentioned change created a regression with multi-ABI build. It happens
because in qtDependencies[ARCH] container, some libs just have different
atchitecture prefix.

This commit remove architecture prefix when checking libs in
qtDependencies container.

Fixes: QTBUG-131707
Pick-to: 6.8
Change-Id: Iae54779bfa4bd143ec35353604724d8ec4e35ef2
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
(cherry picked from commit e59308c5119caac5d4f1024c7d8147e9887cb246)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Bartlomiej Moskal 2024-11-28 18:33:40 +01:00 committed by Qt Cherry-pick Bot
parent 7c332839e0
commit 6e3d2ad44f
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/tools/androiddeployqt/main.cpp
View File

@ -1807,10 +1807,15 @@ bool updateLibsXml(Options *options)
QStringList localLibs; QStringList localLibs;
localLibs = options->localLibs[it.key()]; localLibs = options->localLibs[it.key()];
const QString archSuffix = it.key() + ".so"_L1;
const QList<QtDependency>& deps = options->qtDependencies[it.key()]; const QList<QtDependency>& 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 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);
}); });
}; };