From a867a16ef0a29f9b8b7196d0959e980ee17d7876 Mon Sep 17 00:00:00 2001 From: Alexey Edelev Date: Fri, 9 May 2025 13:20:20 +0200 Subject: [PATCH] [Android] Skip goodToCopy check 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 --- src/tools/androiddeployqt/main.cpp | 3 +++ 1 file changed, 3 insertions(+) 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;