Qt/Android: Extend rule cycle prevention hack

After we did remove the hpp tag from the java-generated header, it was
re-added by a file tagger in the cpp modules file, leading to an
unexpected state on rebuilding.
Fix this by replacing the tag, rather than removing it.

Fixes: QBS-1628
Change-Id: I9d182cd30cf9a637733b84234e7a0b37f7583334
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>

1 files changed, 6 insertions, 2 deletions

diff --git a/share/qbs/modules/java/JavaModule.qbs b/share/qbs/modules/java/JavaModule.qbs
index 71f7d8432..ad055fe34 100644
--- a/share/qbs/modules/java/JavaModule.qbs
+++ b/share/qbs/modules/java/JavaModule.qbs
@@ -234,14 +234,18 @@ Module {
         inputsFromDependencies: ["java.jar"]
         explicitlyDependsOn: ["java.class-internal"]
 
-        outputFileTags: ["java.class"].concat(_tagJniHeaders ? ["hpp"] : []) // Annotations can produce additional java source files. Ignored for now.
+        outputFileTags: ["java.class"].concat(_tagJniHeaders ? ["hpp"] : ["java.jni-hpp"]) // Annotations can produce additional java source files. Ignored for now.
         outputArtifacts: {
             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"; });
+                        a.fileTags = a.fileTags.map(function(tag) {
+                            if (tag === "hpp")
+                                return "java.jni-hpp";
+                            return tag;
+                        });
                 }
             }
             return artifacts;