Simplify tags on intermediate targets

All intermediate targets are assigned the fixed tags ["manual"].
fmeum · Oct 22, 2021 · dacaa80 · dacaa80
1 parent 42471e9
commit dacaa80
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 13 deletions.
diff --git a/jni/internal/java_library_with_native.bzl b/jni/internal/java_library_with_native.bzl
@@ -16,23 +16,19 @@ load(":common.bzl", "merge_java_infos", "original_java_library_name")
 
 def java_library_with_native(
         name,
-        visibility = None,
         native_libs = None,
         tags = None,
+        visibility = None,
         **java_library_args):
     original_name = original_java_library_name(name)
 
     # Simple concatenation is compatible with select, append is not.
     java_library_args.setdefault("deps", [])
     java_library_args["deps"] += ["@fmeum_rules_jni//jni/tools/native_loader"]
 
-    java_library_args.setdefault("tags", [])
-    if tags:
-        java_library_args["tags"] += tags
-    if "manual" not in java_library_args["tags"]:
-        java_library_args["tags"].append("manual")
     native.java_library(
         name = original_name,
+        tags = ["manual"],
         visibility = visibility,
         **java_library_args
     )

diff --git a/jni/internal/java_native_library.bzl b/jni/internal/java_native_library.bzl
@@ -226,13 +226,6 @@ def java_native_library(
     unix_library_name = "lib%s.so" % name
     windows_library_name = "%s.dll" % name
 
-    # Label cc_binary targets as manual as they should not be built
-    # unnecessarily in the untransitioned configuration.
-    cc_binary_args.setdefault("tags", [])
-    if tags:
-        cc_binary_args["tags"] += tags
-    if "manual" not in cc_binary_args["tags"]:
-        cc_binary_args["tags"].append("manual")
     cc_binary_args.setdefault("deps", [])
 
     # Simple concatenation is compatible with select, append is not.
@@ -245,20 +238,23 @@ def java_native_library(
         name = macos_library_name,
         linkshared = True,
         linkstatic = True,
+        tags = ["manual"],
         visibility = ["//visibility:private"],
         **cc_binary_args
     )
     native.cc_binary(
         name = unix_library_name,
         linkshared = True,
         linkstatic = True,
+        tags = ["manual"],
         visibility = ["//visibility:private"],
         **cc_binary_args
     )
     native.cc_binary(
         name = windows_library_name,
         linkshared = True,
         linkstatic = True,
+        tags = ["manual"],
         visibility = ["//visibility:private"],
         **cc_binary_args
     )