diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2018-08-16 16:17:44 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2018-10-19 09:17:55 +0000 |
| commit | 4ebb16fa78277d23a1f571cc3485ce178588983d (patch) | |
| tree | 9d1cdc694a0d1d227e8b9eae6e1a223c61652a53 /share/qbs/imports/qbs/base | |
| parent | 89d5e584db040bcccab9d8c02479e437f3e37530 (diff) | |
Android: Enable building apps with native code and no multiplexing
Until now, we needed to either put the native part into its own product
or use multiplexing with the "APK product" serving as the aggregate. Now
it is also possible to use a single product without multiplexing, which
is a more natural approach in the case where there is only one
architecture.
Change-Id: I976168c99f75ad8e4940ac61f957c64ad29f5f5c
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'share/qbs/imports/qbs/base')
| -rw-r--r-- | share/qbs/imports/qbs/base/Application.qbs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/share/qbs/imports/qbs/base/Application.qbs b/share/qbs/imports/qbs/base/Application.qbs index 04d5d3feb..694cfb83b 100644 --- a/share/qbs/imports/qbs/base/Application.qbs +++ b/share/qbs/imports/qbs/base/Application.qbs @@ -29,7 +29,7 @@ ****************************************************************************/ NativeBinary { - type: ["application"] + type: isForAndroid && !consoleApplication ? ["android.apk"] : ["application"] property bool usesNativeCode @@ -48,6 +48,8 @@ NativeBinary { } Properties { condition: isForAndroid && !consoleApplication && usesNativeCode + && multiplexByQbsProperties && multiplexByQbsProperties.contains("architectures") + && qbs.architectures && qbs.architectures.length > 1 aggregate: true multiplexedType: "android.nativelibrary" } |