androiddeployqt: Add the missing return value check

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 54c959643e

Task-number: QTBUG-106035
Task-number: QTBUG-107589
Change-Id: Ic3d38e05f8ad283244c87858fee29d1035a0da15
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
This commit is contained in:
Alexey Edelev 2022-11-01 15:15:41 +01:00
parent 7c1270ea76
commit 769a28242e

View File

@ -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);