a bit of cleanup

markdroth · Oct 14, 2024 · 0290154 · 0290154
1 parent 71ce661
commit 0290154
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 15 deletions.
diff --git a/BUILD b/BUILD
@@ -19,7 +19,6 @@ load("@bazel_skylib//rules:common_settings.bzl", "bool_flag")
 load(
     "//bazel:grpc_build_system.bzl",
     "grpc_cc_library",
-    "grpc_cc_proto_library",
     "grpc_clang_cl_settings",
     "grpc_filegroup",
     "grpc_generate_one_off_targets",
@@ -4990,11 +4989,6 @@ grpc_upb_proto_reflection_library(
     deps = ["@envoy_api//envoy/config/cluster/v3:pkg"],
 )
 
-grpc_cc_proto_library(
-    name = "envoy_config_core_cc_proto",
-    deps = ["@envoy_api//envoy/config/core/v3:pkg"],
-)
-
 grpc_upb_proto_library(
     name = "envoy_config_core_upb",
     deps = ["@envoy_api//envoy/config/core/v3:pkg"],
@@ -5180,11 +5174,6 @@ grpc_upb_proto_reflection_library(
     deps = ["@envoy_api//envoy/extensions/upstreams/http/v3:pkg"],
 )
 
-grpc_cc_proto_library(
-    name = "envoy_service_discovery_cc_proto",
-    deps = ["@envoy_api//envoy/service/discovery/v3:pkg"],
-)
-
 grpc_upb_proto_library(
     name = "envoy_service_discovery_upb",
     deps = ["@envoy_api//envoy/service/discovery/v3:pkg"],

diff --git a/bazel/grpc_build_system.bzl b/bazel/grpc_build_system.bzl
@@ -29,7 +29,6 @@ Contains macros used throughout the repo.
 
 load("@build_bazel_rules_apple//apple:ios.bzl", "ios_unit_test")
 load("@build_bazel_rules_apple//apple/testing/default_runner:ios_test_runner.bzl", "ios_test_runner")
-load("@com_google_protobuf//bazel:cc_proto_library.bzl", "cc_proto_library")
 load("@com_google_protobuf//bazel:upb_proto_library.bzl", "upb_proto_library", "upb_proto_reflection_library")
 load("//bazel:cc_grpc_library.bzl", "cc_grpc_library")
 load("//bazel:copts.bzl", "GRPC_DEFAULT_COPTS")
@@ -795,9 +794,6 @@ def grpc_objc_library(
         visibility = visibility,
     )
 
-def grpc_cc_proto_library(name, deps):
-    cc_proto_library(name = name, deps = deps)
-
 def grpc_upb_proto_library(name, deps):
     upb_proto_library(name = name, deps = deps)
 

diff --git a/bazel/grpc_deps.bzl b/bazel/grpc_deps.bzl
@@ -218,6 +218,7 @@ def grpc_deps():
             sha256 = "5ac743bf5f05d88e84962e978811f2524df09602b789c92cf7ae2111ecdeda94",
             strip_prefix = "bazel_features-1.14.0",
             urls = [
+                "https://storage.googleapis.com/grpc-bazel-mirror/github.com/bazel-contrib/bazel_features/releases/download/v1.14.0/bazel_features-v1.14.0.tar.gz",
                 "https://github.com/bazel-contrib/bazel_features/releases/download/v1.14.0/bazel_features-v1.14.0.tar.gz",
             ],
         )
@@ -227,6 +228,7 @@ def grpc_deps():
             sha256 = "6fb6767d1bef535310547e03247f7518b03487740c11b6c6adb7952033fe1295",
             strip_prefix = "rules_proto-6.0.2",
             urls = [
+                "https://storage.googleapis.com/grpc-bazel-mirror/github.com/bazelbuild/rules_proto/archive/refs/tags/6.0.2.tar.gz",
                 "https://github.com/bazelbuild/rules_proto/archive/refs/tags/6.0.2.tar.gz",
             ],
         )