Small cleanups in `common/options/**/BUILD` files.
PiperOrigin-RevId: 381366147
diff --git a/src/main/java/com/google/devtools/common/options/BUILD b/src/main/java/com/google/devtools/common/options/BUILD
index 3e34b6c..c2f08b3 100644
--- a/src/main/java/com/google/devtools/common/options/BUILD
+++ b/src/main/java/com/google/devtools/common/options/BUILD
@@ -5,6 +5,15 @@
# 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 = [
@@ -12,7 +21,7 @@
"InvocationPolicyParser.java",
],
deps = [
- ":options",
+ ":options_internal",
"//src/main/protobuf:invocation_policy_java_proto",
"//third_party:flogger",
"//third_party:guava",
@@ -39,16 +48,7 @@
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
index 51ca753..ec29ae4 100644
--- 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 @@
# 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
index e5143e3..47a90b9 100644
--- 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 @@
# 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(
