Use //third_party/protobuf:protobuf_java instead of //third_party/protobuf:protobuf to refer to the Java proto runtime.
(second attempt)
This is the name in the upstream protobuf repo.
--
PiperOrigin-RevId: 147057949
MOS_MIGRATED_REVID=147057949
diff --git a/src/main/java/com/google/devtools/build/lib/actions/BUILD b/src/main/java/com/google/devtools/build/lib/actions/BUILD
index 0af56d5..ce36aeb 100644
--- a/src/main/java/com/google/devtools/build/lib/actions/BUILD
+++ b/src/main/java/com/google/devtools/build/lib/actions/BUILD
@@ -29,7 +29,7 @@
"//third_party:auto_value",
"//third_party:guava",
"//third_party:jsr305",
- "//third_party/protobuf",
+ "//third_party/protobuf:protobuf_java",
],
)
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/dash/BUILD b/src/main/java/com/google/devtools/build/lib/bazel/dash/BUILD
index b577c82..635b29a 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/dash/BUILD
+++ b/src/main/java/com/google/devtools/build/lib/bazel/dash/BUILD
@@ -13,7 +13,7 @@
"//third_party:apache_httpclient",
"//third_party:apache_httpcore",
"//third_party:guava",
- "//third_party/protobuf",
+ "//third_party/protobuf:protobuf_java",
],
)
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/BUILD b/src/main/java/com/google/devtools/build/lib/rules/cpp/BUILD
index 76df2a1..197ade4 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/BUILD
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/BUILD
@@ -32,7 +32,7 @@
"//third_party:auto_value",
"//third_party:guava",
"//third_party:jsr305",
- "//third_party/protobuf",
+ "//third_party/protobuf:protobuf_java",
],
)
diff --git a/src/main/java/com/google/devtools/build/lib/rules/genquery/BUILD b/src/main/java/com/google/devtools/build/lib/rules/genquery/BUILD
index 81abba0..959cf58 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/genquery/BUILD
+++ b/src/main/java/com/google/devtools/build/lib/rules/genquery/BUILD
@@ -24,7 +24,7 @@
"//src/main/java/com/google/devtools/common/options",
"//third_party:guava",
"//third_party:jsr305",
- "//third_party/protobuf",
+ "//third_party/protobuf:protobuf_java",
],
)
diff --git a/src/main/java/com/google/devtools/build/lib/rules/genrule/BUILD b/src/main/java/com/google/devtools/build/lib/rules/genrule/BUILD
index f8c42c9..5c97ae1 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/genrule/BUILD
+++ b/src/main/java/com/google/devtools/build/lib/rules/genrule/BUILD
@@ -19,7 +19,7 @@
"//src/main/java/com/google/devtools/build/lib/rules/cpp",
"//third_party:guava",
"//third_party:jsr305",
- "//third_party/protobuf",
+ "//third_party/protobuf:protobuf_java",
],
)
diff --git a/src/main/java/com/google/devtools/build/lib/worker/BUILD b/src/main/java/com/google/devtools/build/lib/worker/BUILD
index 8e2c21f..50d3928 100644
--- a/src/main/java/com/google/devtools/build/lib/worker/BUILD
+++ b/src/main/java/com/google/devtools/build/lib/worker/BUILD
@@ -23,7 +23,7 @@
"//third_party:apache_commons_pool2",
"//third_party:guava",
"//third_party:jsr305",
- "//third_party/protobuf",
+ "//third_party/protobuf:protobuf_java",
],
)
diff --git a/src/objc_tools/bundlemerge/BUILD b/src/objc_tools/bundlemerge/BUILD
index ce0df99..25862da 100644
--- a/src/objc_tools/bundlemerge/BUILD
+++ b/src/objc_tools/bundlemerge/BUILD
@@ -9,7 +9,7 @@
":bundlemerge_lib",
"//src/main/protobuf:bundlemerge_java_proto",
"//src/objc_tools/plmerge:plmerge_lib",
- "//third_party/protobuf",
+ "//third_party/protobuf:protobuf_java",
],
)
@@ -26,7 +26,7 @@
"//third_party:guava",
"//third_party:jsr305",
"//third_party/java/dd_plist",
- "//third_party/protobuf",
+ "//third_party/protobuf:protobuf_java",
],
)
diff --git a/src/objc_tools/xcodegen/BUILD b/src/objc_tools/xcodegen/BUILD
index 581d924..606bb16 100644
--- a/src/objc_tools/xcodegen/BUILD
+++ b/src/objc_tools/xcodegen/BUILD
@@ -11,7 +11,7 @@
"//src/main/protobuf:xcodegen_java_proto",
"//third_party:guava",
"//third_party/java/buck-ios-support",
- "//third_party/protobuf",
+ "//third_party/protobuf:protobuf_java",
],
)
@@ -33,7 +33,7 @@
"//third_party:jsr305",
"//third_party/java/buck-ios-support",
"//third_party/java/dd_plist",
- "//third_party/protobuf",
+ "//third_party/protobuf:protobuf_java",
],
)
diff --git a/src/test/java/com/google/devtools/build/android/ideinfo/BUILD b/src/test/java/com/google/devtools/build/android/ideinfo/BUILD
index 2476fce..1fe3a18 100644
--- a/src/test/java/com/google/devtools/build/android/ideinfo/BUILD
+++ b/src/test/java/com/google/devtools/build/android/ideinfo/BUILD
@@ -17,7 +17,7 @@
"//third_party:jsr305",
"//third_party:junit4",
"//third_party:truth",
- "//third_party/protobuf",
+ "//third_party/protobuf:protobuf_java",
],
)
@@ -33,7 +33,7 @@
"//third_party:jsr305",
"//third_party:junit4",
"//third_party:truth",
- "//third_party/protobuf",
+ "//third_party/protobuf:protobuf_java",
],
)
@@ -48,6 +48,6 @@
"//third_party:guava",
"//third_party:junit4",
"//third_party:truth",
- "//third_party/protobuf",
+ "//third_party/protobuf:protobuf_java",
],
)
diff --git a/src/tools/android/java/com/google/devtools/build/android/BUILD b/src/tools/android/java/com/google/devtools/build/android/BUILD
index a4b1ca1..34cf96c 100644
--- a/src/tools/android/java/com/google/devtools/build/android/BUILD
+++ b/src/tools/android/java/com/google/devtools/build/android/BUILD
@@ -43,7 +43,7 @@
"//third_party:jsr305",
"//third_party/java/android_databinding:exec",
"//third_party/java/aosp_gradle_core",
- "//third_party/protobuf",
+ "//third_party/protobuf:protobuf_java",
],
)
diff --git a/src/tools/android/java/com/google/devtools/build/android/ideinfo/BUILD b/src/tools/android/java/com/google/devtools/build/android/ideinfo/BUILD
index 719aca6..c416043 100644
--- a/src/tools/android/java/com/google/devtools/build/android/ideinfo/BUILD
+++ b/src/tools/android/java/com/google/devtools/build/android/ideinfo/BUILD
@@ -34,7 +34,7 @@
"//src/tools/android/java/com/google/devtools/build/android:android_builder_lib",
"//third_party:guava",
"//third_party:jsr305",
- "//third_party/protobuf",
+ "//third_party/protobuf:protobuf_java",
],
)
@@ -69,7 +69,7 @@
"//src/tools/android/java/com/google/devtools/build/android:android_builder_lib",
"//third_party:guava",
"//third_party:jsr305",
- "//third_party/protobuf",
+ "//third_party/protobuf:protobuf_java",
],
)
diff --git a/src/tools/benchmark/java/com/google/devtools/build/benchmark/BUILD b/src/tools/benchmark/java/com/google/devtools/build/benchmark/BUILD
index b2c4956..866c52a 100644
--- a/src/tools/benchmark/java/com/google/devtools/build/benchmark/BUILD
+++ b/src/tools/benchmark/java/com/google/devtools/build/benchmark/BUILD
@@ -18,8 +18,8 @@
"//src/main/java/com/google/devtools/common/options",
"//src/tools/benchmark/java/com/google/devtools/build/benchmark/codegenerator:codegenerator_lib",
"//third_party:guava",
- "//third_party/protobuf",
"//third_party/protobuf:protobuf-util",
+ "//third_party/protobuf:protobuf_java",
],
)
@@ -34,8 +34,8 @@
"//src/main/java/com/google/devtools/common/options",
"//src/tools/benchmark/java/com/google/devtools/build/benchmark/codegenerator:codegenerator_lib",
"//third_party:guava",
- "//third_party/protobuf",
"//third_party/protobuf:protobuf-util",
+ "//third_party/protobuf:protobuf_java",
],
)
diff --git a/src/tools/remote_worker/src/main/java/com/google/devtools/build/remote/BUILD b/src/tools/remote_worker/src/main/java/com/google/devtools/build/remote/BUILD
index d41b79b..fcd8264 100644
--- a/src/tools/remote_worker/src/main/java/com/google/devtools/build/remote/BUILD
+++ b/src/tools/remote_worker/src/main/java/com/google/devtools/build/remote/BUILD
@@ -27,6 +27,6 @@
"//third_party:hazelcast",
"//third_party:netty",
"//third_party/grpc:grpc-jar",
- "//third_party/protobuf",
+ "//third_party/protobuf:protobuf_java",
],
)
diff --git a/tools/build_rules/genproto.bzl b/tools/build_rules/genproto.bzl
index 8270387..5ccd934 100644
--- a/tools/build_rules/genproto.bzl
+++ b/tools/build_rules/genproto.bzl
@@ -114,7 +114,7 @@
grpc_java_plugin = str(Label("//third_party/grpc:grpc-java-plugin"))
gensrcjar(name=name + "_srcjar", src=src, grpc_java_plugin=grpc_java_plugin)
- deps = [str(Label("//third_party/protobuf"))]
+ deps = [str(Label("//third_party/protobuf:protobuf_java"))]
if use_grpc_plugin:
deps += [
str(Label("//third_party/grpc:grpc-jar")),
