diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2018-08-16 14:15:28 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2018-11-16 09:14:00 +0000 |
| commit | 009f411f605d604f181b7652a6bbcc0d96831b42 (patch) | |
| tree | a9474370340ced2fa4afaee34f42ac6375c7ed65 /share | |
| parent | 970f59f322e0a0ee5915fc2443cd6bc38666631b (diff) | |
Properly support building Qt apps for Android
... via the androiddeployqt tool.
Fixes: QBS-991
Change-Id: I4a3abe977fee6a9d1657a4fd6c1b43709429da9f
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'share')
| -rw-r--r-- | share/qbs/modules/java/JavaModule.qbs | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/share/qbs/modules/java/JavaModule.qbs b/share/qbs/modules/java/JavaModule.qbs index 1eba96d37..5191d6497 100644 --- a/share/qbs/modules/java/JavaModule.qbs +++ b/share/qbs/modules/java/JavaModule.qbs @@ -64,6 +64,8 @@ Module { property string keytoolFilePath: FileInfo.joinPaths(jdkPath, "bin", keytoolName) property string keytoolName: "keytool" + property bool _tagJniHeaders: true + property string jdkPath: jdk.path version: [compilerVersionMajor, compilerVersionMinor, compilerVersionPatch].join(".") @@ -232,9 +234,17 @@ Module { inputsFromDependencies: ["java.jar"] explicitlyDependsOn: ["java.class-internal"] - outputFileTags: ["java.class", "hpp"] // Annotations can produce additional java source files. Ignored for now. + outputFileTags: ["java.class"].concat(_tagJniHeaders ? ["hpp"] : []) // Annotations can produce additional java source files. Ignored for now. outputArtifacts: { - return JavaUtils.outputArtifacts(product, inputs); + var artifacts = JavaUtils.outputArtifacts(product, inputs); + if (!product.java._tagJniHeaders) { + for (var i = 0; i < artifacts.length; ++i) { + var a = artifacts[i]; + if (Array.isArray(a.fileTags)) + a.fileTags = a.fileTags.filter(function(tag) { return tag != "hpp"; }); + } + } + return artifacts; } prepare: { var cmd = new Command(ModUtils.moduleProperty(product, "compilerFilePath"), |