androiddeployqt: Copy templates and stdcpp lib in auxillary mode
[ChangeLog][Android][Deployment Changes] Now the auxillary mode of androiddeployqt also copies the templates and the stdcpp lib file without building the APK. Fixes: QTBUG-115241 Change-Id: I3d4647277e7f62f079c683645443462ef8026948 Reviewed-by: Tinja Paavoseppä <tinja.paavoseppa@qt.io>
This commit is contained in:
parent
e72a898c50
commit
1e7fa7dbe8
@ -3310,7 +3310,7 @@ int main(int argc, char *argv[])
|
|||||||
it.value().qtDirectories);
|
it.value().qtDirectories);
|
||||||
|
|
||||||
// All architectures have a copy of the gradle files but only one set needs to be copied.
|
// All architectures have a copy of the gradle files but only one set needs to be copied.
|
||||||
if (!androidTemplatetCopied && options.build && !options.auxMode && !options.copyDependenciesOnly) {
|
if (!androidTemplatetCopied && options.build && !options.copyDependenciesOnly) {
|
||||||
cleanAndroidFiles(options);
|
cleanAndroidFiles(options);
|
||||||
if (Q_UNLIKELY(options.timing))
|
if (Q_UNLIKELY(options.timing))
|
||||||
fprintf(stdout, "[TIMING] %lld ns: Cleaned Android file\n", options.timer.nsecsElapsed());
|
fprintf(stdout, "[TIMING] %lld ns: Cleaned Android file\n", options.timer.nsecsElapsed());
|
||||||
@ -3347,13 +3347,12 @@ int main(int argc, char *argv[])
|
|||||||
if (Q_UNLIKELY(options.timing))
|
if (Q_UNLIKELY(options.timing))
|
||||||
fprintf(stdout, "[TIMING] %lld ns: Copied extra resources\n", options.timer.nsecsElapsed());
|
fprintf(stdout, "[TIMING] %lld ns: Copied extra resources\n", options.timer.nsecsElapsed());
|
||||||
|
|
||||||
if (!options.auxMode) {
|
if (!copyStdCpp(&options))
|
||||||
if (!copyStdCpp(&options))
|
return CannotCopyGnuStl;
|
||||||
return CannotCopyGnuStl;
|
|
||||||
|
if (Q_UNLIKELY(options.timing))
|
||||||
|
fprintf(stdout, "[TIMING] %lld ns: Copied GNU STL\n", options.timer.nsecsElapsed());
|
||||||
|
|
||||||
if (Q_UNLIKELY(options.timing))
|
|
||||||
fprintf(stdout, "[TIMING] %lld ns: Copied GNU STL\n", options.timer.nsecsElapsed());
|
|
||||||
}
|
|
||||||
// If Unbundled deployment is used, remove app lib as we don't want it packaged inside the APK
|
// If Unbundled deployment is used, remove app lib as we don't want it packaged inside the APK
|
||||||
if (options.deploymentMechanism == Options::Unbundled) {
|
if (options.deploymentMechanism == Options::Unbundled) {
|
||||||
QString appLibPath = "%1/libs/%2/lib%3_%2.so"_L1.
|
QString appLibPath = "%1/libs/%2/lib%3_%2.so"_L1.
|
||||||
|
Loading…
x
Reference in New Issue
Block a user