From 19aa952bf8cec03aac8240e2117dea294bce7b99 Mon Sep 17 00:00:00 2001 From: Xdng Yng Date: Tue, 1 Oct 2024 14:21:54 -0700 Subject: [PATCH] Upgrade everything! [ PiperOrigin-RevId: 681163732 --- .../devtools/build/lib/buildeventstream/proto/BUILD | 2 +- .../google/devtools/build/lib/packages/metrics/BUILD | 1 + third_party/bazel/src/main/protobuf/BUILD | 11 ++++++----- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/third_party/bazel/src/main/java/com/google/devtools/build/lib/buildeventstream/proto/BUILD b/third_party/bazel/src/main/java/com/google/devtools/build/lib/buildeventstream/proto/BUILD index 29bf00eb76c..a46f2edc44e 100644 --- a/third_party/bazel/src/main/java/com/google/devtools/build/lib/buildeventstream/proto/BUILD +++ b/third_party/bazel/src/main/java/com/google/devtools/build/lib/buildeventstream/proto/BUILD @@ -1,5 +1,5 @@ +load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library") load("@rules_java//java:defs.bzl", "java_proto_library") -load("@rules_proto//proto:defs.bzl", "proto_library") package(default_visibility = ["//visibility:public"]) diff --git a/third_party/bazel/src/main/java/com/google/devtools/build/lib/packages/metrics/BUILD b/third_party/bazel/src/main/java/com/google/devtools/build/lib/packages/metrics/BUILD index da0c95efd6b..74874ab41db 100644 --- a/third_party/bazel/src/main/java/com/google/devtools/build/lib/packages/metrics/BUILD +++ b/third_party/bazel/src/main/java/com/google/devtools/build/lib/packages/metrics/BUILD @@ -1,3 +1,4 @@ +load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library") load("@rules_java//java:defs.bzl", "java_library", "java_proto_library") package(default_visibility = ["//visibility:public"]) diff --git a/third_party/bazel/src/main/protobuf/BUILD b/third_party/bazel/src/main/protobuf/BUILD index 3c399b2c428..fe11eb7b5c2 100644 --- a/third_party/bazel/src/main/protobuf/BUILD +++ b/third_party/bazel/src/main/protobuf/BUILD @@ -1,4 +1,5 @@ -load("@rules_proto//proto:defs.bzl", "proto_library") +load("@com_google_protobuf//bazel:cc_proto_library.bzl", "cc_proto_library") +load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library") load("@rules_python//python:proto.bzl", "py_proto_library") package(default_visibility = ["//visibility:public"]) @@ -171,9 +172,9 @@ proto_library( srcs = ["remote_execution_log.proto"], deps = [ "@com_google_protobuf//:timestamp_proto", - "@googleapis//:google_bytestream_bytestream_proto", - "@googleapis//:google_longrunning_operations_proto", - "@googleapis//:google_rpc_status_proto", + "@googleapis//google/bytestream:bytestream_proto", + "@googleapis//google/longrunning:operations_proto", + "@googleapis//google/rpc:status_proto", "@remoteapis//:build_bazel_remote_execution_v2_remote_execution_proto", ], ) @@ -208,7 +209,7 @@ proto_library( srcs = ["bazel_output_service.proto"], deps = [ "@com_google_protobuf//:any_proto", - "@googleapis//:google_rpc_status_proto", + "@googleapis//google/rpc:status_proto", ], )