summaryrefslogtreecommitdiff
path: root/share/qbs/modules
diff options
context:
space:
mode:
Diffstat (limited to 'share/qbs/modules')
-rw-r--r--share/qbs/modules/Android/sdk/utils.js7
1 files changed, 7 insertions, 0 deletions
diff --git a/share/qbs/modules/Android/sdk/utils.js b/share/qbs/modules/Android/sdk/utils.js
index d217d113b..2b111522e 100644
--- a/share/qbs/modules/Android/sdk/utils.js
+++ b/share/qbs/modules/Android/sdk/utils.js
@@ -91,6 +91,13 @@ function prepareDex(project, product, inputs, outputs, input, output, explicitly
}
product.dependencies.forEach(traverseJarDeps);
+ if (typeof product.artifacts["java.jar"] !== "undefined") {
+ product.artifacts["java.jar"].forEach(function(artifact) {
+ if (!jarFiles.contains(artifact.filePath))
+ jarFiles.push(artifact.filePath);
+ });
+ }
+
args = args.concat(jarFiles);
var cmd;