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

[Android] Skip goodToCopy check

Browse Source 
Skip the goodToCopy check for the libraries that do not belong to
the main ABI. The rationale of this descision - goodToCopy was passing
in per-ABI build already, so we don't need to take care about this
check in main-ABI build. Also we indroduced the last-stand check of
bundled libraries in 7499fd0229d63f969bf6ca58d3b764b96395bed2.

Fixes: QTBUG-136493
Pick-to: 6.8
Change-Id: I438af867b0f25e0ea557bb5066f1c243bb6ab356
Reviewed-by: Bartlomiej Moskal <bartlomiej.moskal@qt.io>
(cherry picked from commit a867a16ef0a29f9b8b7196d0959e980ee17d7876)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Alexey Edelev 2025-05-09 13:20:20 +02:00 committed by Qt Cherry-pick Bot
parent ccf61c3480
commit c2915c84c5
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2775,6 +2775,9 @@ bool goodToCopy(const Options *options, const QString &file, QStringList *unmetD
if (!file.endsWith(".so"_L1))
return true;
if (!options->abi.isEmpty() && options->abi != options->currentArchitecture)
return true;
if (!checkArchitecture(*options, file))
return false;