diff options
| author | Raphaël Cotty <raphael.cotty@gmail.com> | 2020-12-07 13:57:40 +0100 |
|---|---|---|
| committer | Raphaël Cotty <raphael.cotty@gmail.com> | 2020-12-08 12:55:15 +0000 |
| commit | 9025c2e130d9a662354b6722c6b34fd964c5bc2b (patch) | |
| tree | f74888fd052484f05b6ce9c715b95a43f3c8c59e /share/qbs/imports/qbs/PathTools/path-tools.js | |
| parent | bcc64746008826e00b3ceaba761449f01a500b2d (diff) | |
Android: Fix debugging support
Add archSuffix to generate the library with the architecture name for
Qt > 5.14 (before the lib was renamed which prevented debugging).
Remove rpaths as they are not used on android and generate warnings.
Update target and defines to comply with android's Build System
Maintainers Guide.
Remove stripping step in Qt.android_support as androiddeployqt
actually does the stripping.
Change-Id: I46a273c1cded753223c7b759670477815b625267
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'share/qbs/imports/qbs/PathTools/path-tools.js')
| -rw-r--r-- | share/qbs/imports/qbs/PathTools/path-tools.js | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/share/qbs/imports/qbs/PathTools/path-tools.js b/share/qbs/imports/qbs/PathTools/path-tools.js index b2cb63e39..a857a7139 100644 --- a/share/qbs/imports/qbs/PathTools/path-tools.js +++ b/share/qbs/imports/qbs/PathTools/path-tools.js @@ -107,6 +107,8 @@ function dynamicLibraryFilePath(product, variantSuffix, version, maxParts) { version = undefined; } + fileName += product.moduleProperty("cpp", "archSuffix"); + // Append the suffix (i.e. libqbs.1.0.0.dylib, libqbs.so, qbs.dll) fileName += product.moduleProperty("cpp", "dynamicLibrarySuffix"); |