diff options
| author | Alexey Edelev <[email protected]> | 2025-05-09 13:20:20 +0200 |
|---|---|---|
| committer | Alexey Edelev <[email protected]> | 2025-05-22 20:37:35 +0200 |
| commit | a867a16ef0a29f9b8b7196d0959e980ee17d7876 (patch) | |
| tree | 4ceda69241c128a9f3b0d8fecf0e0ce81640ee79 | |
| parent | 7aa2d1f5deb5eab2408d7bcf08d741f6c1c9a131 (diff) | |
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 6.9
Change-Id: I438af867b0f25e0ea557bb5066f1c243bb6ab356
Reviewed-by: Bartlomiej Moskal <[email protected]>
| -rw-r--r-- | src/tools/androiddeployqt/main.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/tools/androiddeployqt/main.cpp b/src/tools/androiddeployqt/main.cpp index 4094d86809c..c4239808130 100644 --- a/src/tools/androiddeployqt/main.cpp +++ b/src/tools/androiddeployqt/main.cpp @@ -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; |