diff options
| author | Alexey Edelev <alexey.edelev@qt.io> | 2025-09-24 16:18:52 +0200 |
|---|---|---|
| committer | Alexey Edelev <alexey.edelev@qt.io> | 2025-09-25 15:30:21 +0000 |
| commit | db3b8e36c9084ddaba6ae6ecc36dbcc846c4c649 (patch) | |
| tree | 186999f9f055435988695085eb52d141fdefecbd | |
| parent | c02047e39f1da44620ed4c47a54dbf393bbff48c (diff) | |
Fix the goodToCopy omission
a867a16ef0a29f9b8b7196d0959e980ee17d7876 skips the goodToCopy check
for the secondary ABI's to make sure that they land into the libs.xml.
The problem with this approach, is that files actually land to the
main ABI libs directory, but not only listed in the libs.xml as they
should. So goodToCopy should still ensure that files belong the
architecture that we process currently, but do not care about dependencies
for the architectures different from the main one.
Amends a867a16ef0a29f9b8b7196d0959e980ee17d7876
Pick-to: 6.10 dev 6.9 6.8 6.9.3
Task-number: QTBUG-136493
Fixes: QTBUG-140509
Change-Id: I82871354a21fa73e8d6e4ce176996ec2870fa3ea
Reviewed-by: Assam Boudjelthia (Out of Office) <assam.boudjelthia@qt.io>
Reviewed-by: Lauri Pohjanheimo <lauri.pohjanheimo@qt.io>
| -rw-r--r-- | src/tools/androiddeployqt/main.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/tools/androiddeployqt/main.cpp b/src/tools/androiddeployqt/main.cpp index 195cfa9c8aa..d0f876c68c7 100644 --- a/src/tools/androiddeployqt/main.cpp +++ b/src/tools/androiddeployqt/main.cpp @@ -2783,12 +2783,12 @@ 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; + if (!options->abi.isEmpty() && options->abi != options->currentArchitecture) + return true; + bool ret = true; const auto libs = getQtLibsFromElf(*options, file); for (const QString &lib : libs) { |