diff options
author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-08-14 15:41:30 +0200 |
---|---|---|
committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-08-26 01:13:32 +0200 |
commit | b45533161e0a3c0b83c5a11e842ed970227a22de (patch) | |
tree | bddaf8474c9f2bc331fdc47abf7abb29855944e7 /tests/auto/corelib/io | |
parent | d5dc0b6145878365bb0bdccd0ee4f60d636a59aa (diff) |
Android: Fix building apps when Qt is configured with one ABI
When configuring with Qt only with one ABI, certain code paths were
not triggered, which led to a few issues:
- The deployment json file generated by androiddeployqt listed
no architectures.
- The compiled shared library did not have a lib prefix and arch suffix,
which androiddeployqt during the deployment / make apk step.
To fix the architectures missing in the json file, ANDROID_ABIS needs
to be set in android/resolve_config.prf also in the single abi case.
To get the correct file names, android.prf needs to apply the prefixes
and suffixes not only in the build_pass case (multi-abi) but also in
the single abi case (except for config.tests).
The application-binary entry in the json file needs to be without the
extra prefixes and suffixes though, so make a copy of the TARGET value
to be used in the json file, before the name manipulations are
applied.
Pick-to: 5.15
Task-number: QTBUG-85399
Change-Id: Idde92ab7fe883636ccc65a87b91c8a3fc72eefbb
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Diffstat (limited to 'tests/auto/corelib/io')
0 files changed, 0 insertions, 0 deletions