diff --git a/src/tools/androiddeployqt/main.cpp b/src/tools/androiddeployqt/main.cpp index c748c3be448..fa8f7018b25 100644 --- a/src/tools/androiddeployqt/main.cpp +++ b/src/tools/androiddeployqt/main.cpp @@ -227,6 +227,12 @@ static const QHash elfArchitectures = { {"x86_64", "x86_64"} }; +bool goodToCopy(const Options *options, const QString &file, QStringList *unmetDependencies); +bool checkCanImportFromRootPaths(const Options *options, const QString &absolutePath, + const QUrl &moduleUrl); +bool readDependenciesFromElf(Options *options, const QString &fileName, + QSet *usedDependencies, QSet *remainingDependencies); + QString architectureFromName(const QString &name) { QRegularExpression architecture(QStringLiteral("_(armeabi-v7a|arm64-v8a|x86|x86_64).so$")); @@ -1772,6 +1778,11 @@ bool readAndroidDependencyXml(Options *options, if (usedDependencies->contains(fileName.absolutePath)) continue; + if (fileName.absolutePath.endsWith(".so"_L1)) { + QSet remainingDependencies; + readDependenciesFromElf(options, fileName.absolutePath, + usedDependencies, &remainingDependencies); + } usedDependencies->insert(fileName.absolutePath); if (options->verbose) @@ -1926,10 +1937,6 @@ bool readDependenciesFromElf(Options *options, return true; } -bool goodToCopy(const Options *options, const QString &file, QStringList *unmetDependencies); -bool checkCanImportFromRootPaths(const Options *options, const QString &absolutePath, - const QUrl &moduleUrl); - bool scanImports(Options *options, QSet *usedDependencies) { if (options->verbose)