diff options
Diffstat (limited to 'src/tools/androiddeployqt/main.cpp')
-rw-r--r-- | src/tools/androiddeployqt/main.cpp | 70 |
1 files changed, 22 insertions, 48 deletions
diff --git a/src/tools/androiddeployqt/main.cpp b/src/tools/androiddeployqt/main.cpp index 7378cb83888..d34fc5082a7 100644 --- a/src/tools/androiddeployqt/main.cpp +++ b/src/tools/androiddeployqt/main.cpp @@ -144,7 +144,6 @@ struct Options QString qtQmlDirectory; QString qtHostDirectory; std::vector<QString> extraPrefixDirs; - QStringList androidDeployPlugins; // Unlike 'extraPrefixDirs', the 'extraLibraryDirs' key doesn't expect the 'lib' subfolder // when looking for dependencies. std::vector<QString> extraLibraryDirs; @@ -1013,11 +1012,6 @@ bool readInputFile(Options *options) } { - const auto androidDeployPlugins = jsonObject.value("android-deploy-plugins"_L1).toString(); - options->androidDeployPlugins = androidDeployPlugins.split(";"_L1, Qt::SkipEmptyParts); - } - - { const auto extraLibraryDirs = jsonObject.value("extraLibraryDirs"_L1).toArray(); options->extraLibraryDirs.reserve(extraLibraryDirs.size()); for (const QJsonValue path : extraLibraryDirs) { @@ -1889,32 +1883,6 @@ QList<QtDependency> findFilesRecursively(const Options &options, const QString & return deps; } -void readDependenciesFromFiles(Options *options, const QList<QtDependency> &files, - QSet<QString> &usedDependencies, - QSet<QString> &remainingDependencies) -{ - for (const QtDependency &fileName : files) { - if (usedDependencies.contains(fileName.absolutePath)) - continue; - - if (fileName.absolutePath.endsWith(".so"_L1)) { - if (!readDependenciesFromElf(options, fileName.absolutePath, &usedDependencies, - &remainingDependencies)) { - fprintf(stdout, "Skipping file dependency: %s\n", - qPrintable(fileName.relativePath)); - continue; - } - } - usedDependencies.insert(fileName.absolutePath); - - if (options->verbose) { - fprintf(stdout, "Appending file dependency: %s\n", qPrintable(fileName.relativePath)); - } - - options->qtDependencies[options->currentArchitecture].append(fileName); - } -} - bool readAndroidDependencyXml(Options *options, const QString &moduleName, QSet<QString> *usedDependencies, @@ -1945,15 +1913,29 @@ bool readAndroidDependencyXml(Options *options, QString file = reader.attributes().value("file"_L1).toString(); - if (reader.attributes().hasAttribute("type"_L1) - && reader.attributes().value("type"_L1) == "plugin_dir"_L1 - && !options->androidDeployPlugins.isEmpty()) { - continue; - } - const QList<QtDependency> fileNames = findFilesRecursively(*options, file); - readDependenciesFromFiles(options, fileNames, *usedDependencies, - *remainingDependencies); + + for (const QtDependency &fileName : fileNames) { + if (usedDependencies->contains(fileName.absolutePath)) + continue; + + if (fileName.absolutePath.endsWith(".so"_L1)) { + QSet<QString> remainingDependencies; + if (!readDependenciesFromElf(options, fileName.absolutePath, + usedDependencies, + &remainingDependencies)) { + fprintf(stdout, "Skipping dependencies from xml: %s\n", + qPrintable(fileName.relativePath)); + continue; + } + } + usedDependencies->insert(fileName.absolutePath); + + if (options->verbose) + fprintf(stdout, "Appending dependency from xml: %s\n", qPrintable(fileName.relativePath)); + + options->qtDependencies[options->currentArchitecture].append(fileName); + } } else if (reader.name() == "jar"_L1) { int bundling = reader.attributes().value("bundling"_L1).toInt(); QString fileName = QDir::cleanPath(reader.attributes().value("file"_L1).toString()); @@ -2430,14 +2412,6 @@ bool readDependencies(Options *options) if (!readDependenciesFromElf(options, "%1/libs/%2/lib%3_%2.so"_L1.arg(options->outputDirectory, options->currentArchitecture, options->applicationBinary), &usedDependencies, &remainingDependencies)) return false; - QList<QtDependency> pluginDeps; - for (const auto &pluginPath : options->androidDeployPlugins) { - pluginDeps.append(findFilesRecursively(*options, QFileInfo(pluginPath), - options->qtInstallDirectory + "/"_L1)); - } - - readDependenciesFromFiles(options, pluginDeps, usedDependencies, remainingDependencies); - while (!remainingDependencies.isEmpty()) { QSet<QString>::iterator start = remainingDependencies.begin(); QString fileName = absoluteFilePath(options, *start); |