Switch C++ test protos to use the normal cc_proto_library rules. (#9950)
diff --git a/java/core/BUILD.bazel b/java/core/BUILD.bazel
index cfd53f4..9c45113 100644
--- a/java/core/BUILD.bazel
+++ b/java/core/BUILD.bazel
@@ -243,6 +243,7 @@
"//:any_proto",
"//:descriptor_proto",
"//:generic_test_protos",
+ "//:lite_test_protos",
"//:wrappers_proto",
],
)
@@ -256,6 +257,14 @@
)
java_proto_library(
+ name = "lite_test_protos_java_proto",
+ visibility = [
+ "//java:__subpackages__",
+ ],
+ deps = ["//:lite_test_protos"],
+)
+
+java_proto_library(
name = "java_test_protos_java_proto",
deps = [":java_test_protos"],
)
@@ -270,6 +279,7 @@
deps = [
":core",
":generic_test_protos_java_proto",
+ ":lite_test_protos_java_proto",
":java_test_protos_java_proto",
"@maven//:com_google_guava_guava",
"@maven//:junit_junit",
@@ -316,6 +326,7 @@
deps = [
":core",
":generic_test_protos_java_proto",
+ ":lite_test_protos_java_proto",
":java_test_protos_java_proto",
":test_util",
"@maven//:com_google_guava_guava",
@@ -353,6 +364,15 @@
)
java_lite_proto_library(
+ name = "lite_test_protos_java_proto_lite",
+ visibility = [
+ "//java/kotlin-lite:__pkg__",
+ "//java/lite:__pkg__",
+ ],
+ deps = ["//:lite_test_protos"],
+)
+
+java_lite_proto_library(
name = "java_test_protos_java_proto_lite",
visibility = [
"//java/lite:__pkg__",
@@ -382,6 +402,7 @@
],
deps = [
":generic_test_protos_java_proto_lite",
+ ":lite_test_protos_java_proto_lite",
":java_test_protos_java_proto_lite",
":lite_runtime_only",
"@maven//:com_google_guava_guava",
@@ -444,6 +465,7 @@
test_prefix = "Lite",
deps = [
":generic_test_protos_java_proto_lite",
+ ":lite_test_protos_java_proto_lite",
":java_test_protos_java_proto_lite",
":lite",
":test_util_lite",
diff --git a/java/kotlin-lite/BUILD.bazel b/java/kotlin-lite/BUILD.bazel
index d3d9ddf..7d5bea5 100644
--- a/java/kotlin-lite/BUILD.bazel
+++ b/java/kotlin-lite/BUILD.bazel
@@ -152,6 +152,7 @@
deps = [
":evil_names_proto2_java_proto_lite",
"//java/core:generic_test_protos_java_proto_lite",
+ "//java/core:lite_test_protos_java_proto_lite",
"//java/kotlin:only_for_use_in_proto_generated_code_its_generator_and_tests",
"//java/kotlin:shared_runtime",
"//java/lite",
@@ -175,6 +176,7 @@
":evil_names_proto3_java_proto_lite",
":multiple_files_proto3_java_proto_lite",
"//java/core:generic_test_protos_java_proto_lite",
+ "//java/core:lite_test_protos_java_proto_lite",
"//java/kotlin:only_for_use_in_proto_generated_code_its_generator_and_tests",
"//java/kotlin:shared_runtime",
"//java/lite",
diff --git a/java/kotlin/BUILD.bazel b/java/kotlin/BUILD.bazel
index 67fc6e0..d89cd7f 100644
--- a/java/kotlin/BUILD.bazel
+++ b/java/kotlin/BUILD.bazel
@@ -240,6 +240,7 @@
":well_known_protos_kotlin",
"//java/core",
"//java/core:generic_test_protos_java_proto",
+ "//java/core:lite_test_protos_java_proto",
],
)
@@ -262,6 +263,7 @@
":shared_runtime",
"//java/core",
"//java/core:generic_test_protos_java_proto",
+ "//java/core:lite_test_protos_java_proto",
],
)
diff --git a/java/lite/BUILD.bazel b/java/lite/BUILD.bazel
index 9ae3c51..885cb00 100644
--- a/java/lite/BUILD.bazel
+++ b/java/lite/BUILD.bazel
@@ -71,6 +71,7 @@
deps = [
":lite",
"//java/core:generic_test_protos_java_proto_lite",
+ "//java/core:lite_test_protos_java_proto_lite",
"//java/core:java_test_protos_java_proto_lite",
"//java/core:test_util_lite",
"@maven//:com_google_truth_truth",