From 769a28242e406699e8f25ff8097e2e8527af92f0 Mon Sep 17 00:00:00 2001
From: Alexey Edelev <alexey.edelev@qt.io>
Date: Tue, 1 Nov 2022 15:15:41 +0100
Subject: [PATCH] androiddeployqt: Add the missing return value check
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The check doesn't affect the flow, since the same check fails the
androiddeployqt execution later, when resolving all elf dependencies.
Skipping the dependency from xml at earlier stage will allow to continue
deployment procedure, without the missing plugins and their dependencies.

Amends 54c959643ea92c0b87a7807c64f2351328cdce7d

Task-number: QTBUG-106035
Task-number: QTBUG-107589
Change-Id: Ic3d38e05f8ad283244c87858fee29d1035a0da15
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
---
 src/tools/androiddeployqt/main.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/tools/androiddeployqt/main.cpp b/src/tools/androiddeployqt/main.cpp
index e67af3becf1..5b85c9485af 100644
--- a/src/tools/androiddeployqt/main.cpp
+++ b/src/tools/androiddeployqt/main.cpp
@@ -1781,8 +1781,13 @@ bool readAndroidDependencyXml(Options *options,
 
                         if (fileName.absolutePath.endsWith(".so"_L1)) {
                             QSet<QString> remainingDependencies;
-                            readDependenciesFromElf(options, fileName.absolutePath,
-                                                    usedDependencies, &remainingDependencies);
+                            if (!readDependenciesFromElf(options, fileName.absolutePath,
+                                                         usedDependencies,
+                                                         &remainingDependencies)) {
+                                fprintf(stdout, "Skipping dependencies from xml: %s\n",
+                                        qPrintable(fileName.relativePath));
+                                continue;
+                            }
                         }
                         usedDependencies->insert(fileName.absolutePath);