1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Android: fix manual deployment with ANDROID_DEPLOYMENT_DEPENDENCIES

Browse Source 
Fix the qtforandroid (i.e. libplugins_platforms_qtforandroid) check
and avoid calling llvm-readobj on non-library files and only add them
to the dependency list.

Task-number: QTBUG-94232
Change-Id: Id1a415b6d9834daaf5337e9bd15e7daf69fd574f
Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
(cherry picked from commit 4521dfe75ad147fc5510702b33189dd2faed93fd)
Reviewed-by: Rami Potinkara <rami.potinkara@qt.io>
This commit is contained in:
Assam Boudjelthia 2023-03-21 21:22:13 +02:00
parent 000d3d5908
commit 8491d03d3f
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/tools/androiddeployqt/main.cpp
View File

@ -1109,12 +1109,17 @@ bool readInputFile(Options *options)
} }
} }
} else { } else {
auto arch = fileArchitecture(*options, path); if (dependency.endsWith(QLatin1String(".so"))) {
if (!arch.isEmpty()) { auto arch = fileArchitecture(*options, path);
options->qtDependencies[arch].append(QtDependency(dependency.toString(), path)); if (!arch.isEmpty()) {
} else if (options->verbose) { options->qtDependencies[arch].append(QtDependency(dependency.toString(), path));
fprintf(stderr, "Skipping \"%s\", unknown architecture\n", qPrintable(path)); } else if (options->verbose) {
fflush(stderr); fprintf(stderr, "Skipping \"%s\", unknown architecture\n", qPrintable(path));
fflush(stderr);
}
} else {
for (auto arch : options->architectures.keys())
options->qtDependencies[arch].append(QtDependency(dependency.toString(), path));
} }
} }
} }
@ -1422,7 +1427,7 @@ bool updateLibsXml(Options *options)
if (localLibs.isEmpty()) { if (localLibs.isEmpty()) {
QString plugin; QString plugin;
for (const QtDependency &qtDependency : options->qtDependencies[it.key()]) { for (const QtDependency &qtDependency : options->qtDependencies[it.key()]) {
if (qtDependency.relativePath.endsWith(QLatin1String("libqtforandroid.so"))) if (qtDependency.relativePath.contains(QLatin1String("libplugins_platforms_qtforandroid_")))
plugin = qtDependency.relativePath; plugin = qtDependency.relativePath;
if (qtDependency.relativePath.contains( if (qtDependency.relativePath.contains(
@ -1435,8 +1440,8 @@ bool updateLibsXml(Options *options)
if (plugin.isEmpty()) { if (plugin.isEmpty()) {
fflush(stdout); fflush(stdout);
fprintf(stderr, "No platform plugin (libqtforandroid.so) included in " fprintf(stderr, "No platform plugin (libplugins_platforms_qtforandroid.so) included"
"the deployment. Make sure the app links to Qt Gui library.\n"); " in the deployment. Make sure the app links to Qt Gui library.\n");
fflush(stderr); fflush(stderr);
return false; return false;
} }