From 812c918e29f2f4eab22d3bbceee2af0bc84dd45d Mon Sep 17 00:00:00 2001
From: Zhongpeng Lin <zplin@uber.com>
Date: Sat, 22 Jul 2023 21:20:11 -0700
Subject: [PATCH] fix go builds

---
 WORKSPACE                            |  1 -
 build/bazel/remote/asset/v1/BUILD    |  6 +--
 build/bazel/remote/asset/v1/go/BUILD |  4 +-
 external/BUILD.googleapis            | 78 ----------------------------
 4 files changed, 5 insertions(+), 84 deletions(-)
 delete mode 100644 external/BUILD.googleapis

diff --git a/WORKSPACE b/WORKSPACE
index 062493b4..09344e8d 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -94,7 +94,6 @@ remote_apis_go_deps()
 # Needed for the googleapis protos.
 http_archive(
     name = "googleapis",
-    build_file = "BUILD.googleapis",
     sha256 = "b28c13e99001664eac5f1fb81b44d912d19fbc041e30772263251da131f6573c",
     strip_prefix = "googleapis-bb964feba5980ed70c9fb8f84fe6e86694df65b0",
     urls = ["https://github.com/googleapis/googleapis/archive/bb964feba5980ed70c9fb8f84fe6e86694df65b0.zip"],
diff --git a/build/bazel/remote/asset/v1/BUILD b/build/bazel/remote/asset/v1/BUILD
index a09bea40..f360b4fe 100644
--- a/build/bazel/remote/asset/v1/BUILD
+++ b/build/bazel/remote/asset/v1/BUILD
@@ -11,9 +11,9 @@ proto_library(
         "//build/bazel/remote/execution/v2:remote_execution_proto",
         "@com_google_protobuf//:duration_proto",
         "@com_google_protobuf//:timestamp_proto",
-        "@googleapis//:google_api_annotations_proto",
-        "@googleapis//:google_api_http_proto",
-        "@googleapis//:google_rpc_status_proto",
+        "@googleapis//google/api:annotations_proto",
+        "@googleapis//google/api:http_proto",
+        "@googleapis//google/rpc:status_proto",
     ],
 )
 
diff --git a/build/bazel/remote/asset/v1/go/BUILD b/build/bazel/remote/asset/v1/go/BUILD
index 076422ce..f1b1d262 100644
--- a/build/bazel/remote/asset/v1/go/BUILD
+++ b/build/bazel/remote/asset/v1/go/BUILD
@@ -10,8 +10,8 @@ go_proto_library(
     proto = "//build/bazel/remote/asset/v1:remote_asset_proto",
     deps = [
         "//build/bazel/remote/execution/v2:remote_execution_go_proto",
-        "@go_googleapis//google/api:annotations_go_proto",
-        "@go_googleapis//google/rpc:status_go_proto",
+        "@org_golang_google_genproto//googleapis/api/annotations",
+        "@org_golang_google_genproto//googleapis/rpc/status",
     ],
 )
 
diff --git a/external/BUILD.googleapis b/external/BUILD.googleapis
deleted file mode 100644
index 5225788f..00000000
--- a/external/BUILD.googleapis
+++ /dev/null
@@ -1,78 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-load("@rules_proto//proto:defs.bzl", "proto_library")
-load("@com_github_grpc_grpc//bazel:cc_grpc_library.bzl", "cc_grpc_library")
-
-licenses(["notice"])
-
-proto_library(
-    name = "google_api_annotations_proto",
-    srcs = ["google/api/annotations.proto"],
-    deps = [
-        ":google_api_http_proto",
-        "@com_google_protobuf//:descriptor_proto",
-    ],
-)
-
-cc_grpc_library(
-    name = "google_api_annotations_cc_proto",
-    srcs = ["google/api/annotations.proto"],
-    deps = [":google_api_http_cc_proto"],
-    proto_only = False,
-    well_known_protos = True,
-    use_external = False,
-)
-
-proto_library(
-    name = "google_api_http_proto",
-    srcs = ["google/api/http.proto"],
-)
-
-cc_grpc_library(
-    name = "google_api_http_cc_proto",
-    srcs = ["google/api/http.proto"],
-    deps = [],
-    proto_only = False,
-    well_known_protos = True,
-    use_external = False,
-)
-
-proto_library(
-    name = "google_longrunning_operations_proto",
-    srcs = ["google/longrunning/operations.proto"],
-    deps = [
-        ":google_api_annotations_proto",
-        ":google_api_http_proto",
-        ":google_rpc_status_proto",
-        "@com_google_protobuf//:any_proto",
-        "@com_google_protobuf//:empty_proto",
-    ],
-)
-
-cc_grpc_library(
-    name = "google_longrunning_operations_cc_proto",
-    srcs = ["google/longrunning/operations.proto"],
-    deps = [
-        ":google_api_annotations_cc_proto",
-        ":google_api_http_cc_proto",
-        ":google_rpc_status_cc_proto",
-    ],
-    proto_only = False,
-    well_known_protos = True,
-    use_external = False,
-)
-
-proto_library(
-    name = "google_rpc_status_proto",
-    srcs = ["google/rpc/status.proto"],
-    deps = ["@com_google_protobuf//:any_proto"],
-)
-
-cc_grpc_library(
-    name = "google_rpc_status_cc_proto",
-    srcs = ["google/rpc/status.proto"],
-    deps = [],
-    proto_only = False,
-    well_known_protos = True,
-    use_external = False,
-)