[Bazel] Expand lists of protos in BUILD files (#9915)
This unrolls several lists based on WELL_KNOWN_PROTO maps, and move internal java codegen rules next to the corresponding java_library targets that expose them.
diff --git a/java/core/BUILD.bazel b/java/core/BUILD.bazel
index e36a38e..dbb665c 100644
--- a/java/core/BUILD.bazel
+++ b/java/core/BUILD.bazel
@@ -4,6 +4,7 @@
load("@rules_pkg//:mappings.bzl", "pkg_files", "strip_prefix")
load("@rules_proto//proto:defs.bzl", "proto_lang_toolchain", "proto_library")
load("//:internal.bzl", "conformance_test")
+load("//:protobuf.bzl", "internal_gen_well_known_protos_java")
load("//:protobuf_version.bzl", "PROTOBUF_JAVA_VERSION")
load("//java/internal:testing.bzl", "junit_tests")
@@ -102,11 +103,28 @@
"src/main/java/com/google/protobuf/Writer.java",
]
+internal_gen_well_known_protos_java(
+ name = "gen_well_known_protos_javalite",
+ javalite = True,
+ deps = [
+ "//:any_proto",
+ "//:api_proto",
+ "//:duration_proto",
+ "//:empty_proto",
+ "//:field_mask_proto",
+ "//:source_context_proto",
+ "//:struct_proto",
+ "//:timestamp_proto",
+ "//:type_proto",
+ "//:wrappers_proto",
+ ],
+)
+
# Should be used as `//java/lite`.
java_library(
name = "lite",
srcs = LITE_SRCS + [
- "//:gen_well_known_protos_javalite",
+ ":gen_well_known_protos_javalite",
],
visibility = [
"//java/lite:__pkg__",
@@ -130,6 +148,24 @@
srcs = LITE_SRCS,
)
+internal_gen_well_known_protos_java(
+ name = "gen_well_known_protos_java",
+ deps = [
+ "//:any_proto",
+ "//:api_proto",
+ "//:compiler_plugin_proto",
+ "//:descriptor_proto",
+ "//:duration_proto",
+ "//:empty_proto",
+ "//:field_mask_proto",
+ "//:source_context_proto",
+ "//:struct_proto",
+ "//:timestamp_proto",
+ "//:type_proto",
+ "//:wrappers_proto",
+ ],
+)
+
java_library(
name = "core",
srcs = glob(
@@ -138,7 +174,7 @@
],
exclude = LITE_SRCS,
) + [
- "//:gen_well_known_protos_java",
+ ":gen_well_known_protos_java",
],
visibility = ["//visibility:public"],
exports = [
@@ -155,7 +191,8 @@
maven_coordinates = "com.google.protobuf:protobuf-java:%s" % PROTOBUF_JAVA_VERSION,
pom_template = "pom_template.xml",
resources = [
- "//:well_known_protos",
+ "//:built_in_runtime_protos",
+ "//:well_known_type_protos",
],
tags = ["manual"],
runtime_deps = [":core"],
@@ -309,6 +346,7 @@
java_lite_proto_library(
name = "generic_test_protos_java_proto_lite",
visibility = [
+ "//java/kotlin-lite:__pkg__",
"//java/lite:__pkg__",
],
deps = ["//:generic_test_protos"],
