Small cleanups in common/options/**/BUILD files.

PiperOrigin-RevId: 381366147
bazelbuild · Jun 24, 2021 · 6d603b7 · 6d603b7
1 parent 5d955f5
commit 6d603b7
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 24 deletions.
diff --git a/src/main/java/com/google/devtools/common/options/BUILD b/src/main/java/com/google/devtools/common/options/BUILD
@@ -5,14 +5,23 @@ load("@rules_java//java:defs.bzl", "java_library")
 #   Open-sourced as part of Bazel.
 package(default_visibility = ["//src:__subpackages__"])
 
+filegroup(
+    name = "srcs",
+    srcs = glob(["**"]) + [
+        "//src/main/java/com/google/devtools/common/options/testing:srcs",
+        "//src/main/java/com/google/devtools/common/options/processor:srcs",
+    ],
+    visibility = ["//src:__subpackages__"],
+)
+
 java_library(
     name = "invocation_policy",
     srcs = [
         "InvocationPolicyEnforcer.java",
         "InvocationPolicyParser.java",
     ],
     deps = [
-        ":options",
+        ":options_internal",
         "//src/main/protobuf:invocation_policy_java_proto",
         "//third_party:flogger",
         "//third_party:guava",
@@ -39,16 +48,7 @@ java_library(
     deps = [
         "//third_party:auto_value",
         "//third_party:caffeine",
-        "//third_party:flogger",
         "//third_party:guava",
         "//third_party:jsr305",
     ],
 )
-
-filegroup(
-    name = "srcs",
-    srcs = glob(["**"]) + [
-        "//src/main/java/com/google/devtools/common/options/testing:srcs",
-        "//src/main/java/com/google/devtools/common/options/processor:srcs",
-    ],
-)
diff --git a/src/main/java/com/google/devtools/common/options/processor/BUILD b/src/main/java/com/google/devtools/common/options/processor/BUILD
@@ -4,14 +4,10 @@ load("@rules_java//java:defs.bzl", "java_plugin")
 #   A preprocessor for the annotations used in the options parser.
 package(default_visibility = ["//src:__subpackages__"])
 
-licenses(["notice"])  # Apache 2.0
-
 filegroup(
     name = "srcs",
-    srcs = glob(
-        ["**"],
-    ),
-    visibility = ["//src/main/java/com/google/devtools/common/options:__pkg__"],
+    srcs = glob(["**"]),
+    visibility = ["//src:__subpackages__"],
 )
 
 java_plugin(

diff --git a/src/main/java/com/google/devtools/common/options/testing/BUILD b/src/main/java/com/google/devtools/common/options/testing/BUILD
@@ -3,19 +3,15 @@ load("@rules_java//java:defs.bzl", "java_library")
 # Description:
 #   Testing tools for the devtools-common options parser.
 package(
-    default_testonly = 1,
+    default_testonly = True,
     default_visibility = ["//src:__subpackages__"],
 )
 
-licenses(["notice"])  # Apache 2.0
-
 filegroup(
     name = "srcs",
-    testonly = 0,
-    srcs = glob(
-        ["**"],
-    ),
-    visibility = ["//src/main/java/com/google/devtools/common/options:__pkg__"],
+    testonly = False,
+    srcs = glob(["**"]),
+    visibility = ["//src:__subpackages__"],
 )
 
 java_library(