diff --git a/third_party/grpc/BUILD b/third_party/grpc/BUILD index 8183ad9cac9dbe..6e990ccb86b073 100644 --- a/third_party/grpc/BUILD +++ b/third_party/grpc/BUILD @@ -18,7 +18,7 @@ load("//tools/distributions:distribution_rules.bzl", "distrib_java_import", "dis licenses(["notice"]) # Apache v2 -exports_files(["grpc_1.32.0.patch", "grpc_1.34.1.patch"]) +exports_files(["grpc_1.34.1.patch"]) package(default_visibility = ["//visibility:public"]) diff --git a/third_party/grpc/grpc-api-1.32.2.jar b/third_party/grpc/grpc-api-1.32.2.jar deleted file mode 100644 index 26b0ae4222e4b8..00000000000000 Binary files a/third_party/grpc/grpc-api-1.32.2.jar and /dev/null differ diff --git a/third_party/grpc/grpc-auth-1.32.2.jar b/third_party/grpc/grpc-auth-1.32.2.jar deleted file mode 100644 index 9470c72a2aa916..00000000000000 Binary files a/third_party/grpc/grpc-auth-1.32.2.jar and /dev/null differ diff --git a/third_party/grpc/grpc-context-1.32.2.jar b/third_party/grpc/grpc-context-1.32.2.jar deleted file mode 100644 index 91e94b65de02c1..00000000000000 Binary files a/third_party/grpc/grpc-context-1.32.2.jar and /dev/null differ diff --git a/third_party/grpc/grpc-core-1.32.2.jar b/third_party/grpc/grpc-core-1.32.2.jar deleted file mode 100644 index 60ec9075d491be..00000000000000 Binary files a/third_party/grpc/grpc-core-1.32.2.jar and /dev/null differ diff --git a/third_party/grpc/grpc-netty-1.32.2.jar b/third_party/grpc/grpc-netty-1.32.2.jar deleted file mode 100644 index a08935fdf059a2..00000000000000 Binary files a/third_party/grpc/grpc-netty-1.32.2.jar and /dev/null differ diff --git a/third_party/grpc/grpc-protobuf-1.32.2.jar b/third_party/grpc/grpc-protobuf-1.32.2.jar deleted file mode 100644 index 5f8e87f0fd64d4..00000000000000 Binary files a/third_party/grpc/grpc-protobuf-1.32.2.jar and /dev/null differ diff --git a/third_party/grpc/grpc-protobuf-lite-1.32.2.jar b/third_party/grpc/grpc-protobuf-lite-1.32.2.jar deleted file mode 100644 index 1ec35874d92e1c..00000000000000 Binary files a/third_party/grpc/grpc-protobuf-lite-1.32.2.jar and /dev/null differ diff --git a/third_party/grpc/grpc-stub-1.32.2.jar b/third_party/grpc/grpc-stub-1.32.2.jar deleted file mode 100644 index 1b0b6a9b53292a..00000000000000 Binary files a/third_party/grpc/grpc-stub-1.32.2.jar and /dev/null differ diff --git a/third_party/grpc/grpc_1.32.0.patch b/third_party/grpc/grpc_1.32.0.patch deleted file mode 100644 index dda6fc177e8a9b..00000000000000 --- a/third_party/grpc/grpc_1.32.0.patch +++ /dev/null @@ -1,122 +0,0 @@ -commit bb0d04663c7dc6c0096f8717cb4ec26330a5ae40 -Author: Yun Peng -Date: Wed Jun 3 15:35:31 2020 +0200 - - Patch grpc v1.26.0 for Bazel build - - - Avoid loading dependencies that're not needed for the gRPC C++ - libraries - - Add bazel mirror URL for upb and cares - - Redirect zlib to @//third_party/zlib - - Add darwin_arm64 and darwin_arm64e config settings to allow - building for Apple Silicon - -diff --git a/bazel/grpc_build_system.bzl b/bazel/grpc_build_system.bzl -index 7bb6b8bdb9..7644107b70 100644 ---- a/bazel/grpc_build_system.bzl -+++ b/bazel/grpc_build_system.bzl -@@ -25,7 +25,7 @@ - - load("//bazel:cc_grpc_library.bzl", "cc_grpc_library") - load("@upb//bazel:upb_proto_library.bzl", "upb_proto_library") --load("@build_bazel_rules_apple//apple:ios.bzl", "ios_unit_test") -+# load("@build_bazel_rules_apple//apple:ios.bzl", "ios_unit_test") - - # The set of pollers to test against if a test exercises polling - POLLERS = ["epollex", "epoll1", "poll"] -@@ -181,13 +181,13 @@ def ios_cc_test( - testonly = 1, - ) - ios_test_deps = [ios_test_adapter, ":" + test_lib_ios] -- ios_unit_test( -- name = name + "_on_ios", -- size = kwargs.get("size"), -- tags = ios_tags, -- minimum_os_version = "9.0", -- deps = ios_test_deps, -- ) -+ # ios_unit_test( -+ # name = name + "_on_ios", -+ # size = kwargs.get("size"), -+ # tags = ios_tags, -+ # minimum_os_version = "9.0", -+ # deps = ios_test_deps, -+ # ) - - def grpc_cc_test(name, srcs = [], deps = [], external_deps = [], args = [], data = [], uses_polling = True, language = "C++", size = "medium", timeout = None, tags = [], exec_compatible_with = [], exec_properties = {}, shard_count = None, flaky = None): - copts = if_mac(["-DGRPC_CFSTREAM"]) -diff --git a/bazel/grpc_deps.bzl b/bazel/grpc_deps.bzl -index 09fcad95a2..9b737e5deb 100644 ---- a/bazel/grpc_deps.bzl -+++ b/bazel/grpc_deps.bzl -@@ -33,7 +33,7 @@ def grpc_deps(): - - native.bind( - name = "madler_zlib", -- actual = "@zlib//:zlib", -+ actual = "@//third_party/zlib", - ) - - native.bind( -diff --git a/bazel/grpc_extra_deps.bzl b/bazel/grpc_extra_deps.bzl -index 4c1dfad2e8..f63c54ddef 100644 ---- a/bazel/grpc_extra_deps.bzl -+++ b/bazel/grpc_extra_deps.bzl -@@ -1,11 +1,6 @@ - """Loads the dependencies necessary for the external repositories defined in grpc_deps.bzl.""" - --load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps") - load("@upb//bazel:workspace_deps.bzl", "upb_deps") --load("@envoy_api//bazel:repositories.bzl", "api_dependencies") --load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_dependencies") --load("@build_bazel_rules_apple//apple:repositories.bzl", "apple_rules_dependencies") --load("@build_bazel_apple_support//lib:repositories.bzl", "apple_support_dependencies") - - def grpc_extra_deps(): - """Loads the extra dependencies. -@@ -26,15 +21,5 @@ def grpc_extra_deps(): - grpc_extra_deps() - ``` - """ -- protobuf_deps() -- - upb_deps() - -- api_dependencies() -- -- go_rules_dependencies() -- go_register_toolchains() -- -- apple_rules_dependencies() -- -- apple_support_dependencies() -diff --git a/third_party/cares/cares.BUILD b/third_party/cares/cares.BUILD -index c047f0c515..7c24fbc617 100644 ---- a/third_party/cares/cares.BUILD -+++ b/third_party/cares/cares.BUILD -@@ -10,6 +10,16 @@ config_setting( - values = {"cpu": "darwin_x86_64"}, - ) - -+config_setting( -+ name = "darwin_arm64", -+ values = {"cpu": "darwin_arm64"}, -+) -+ -+config_setting( -+ name = "darwin_arm64e", -+ values = {"cpu": "darwin_arm64e"}, -+) -+ - config_setting( - name = "windows", - values = {"cpu": "x64_windows"}, -@@ -99,6 +109,8 @@ copy_file( - ":watchos_arm64_32": "@com_github_grpc_grpc//third_party/cares:config_darwin/ares_config.h", - ":darwin": "@com_github_grpc_grpc//third_party/cares:config_darwin/ares_config.h", - ":darwin_x86_64": "@com_github_grpc_grpc//third_party/cares:config_darwin/ares_config.h", -+ ":darwin_arm64": "@com_github_grpc_grpc//third_party/cares:config_darwin/ares_config.h", -+ ":darwin_arm64e": "@com_github_grpc_grpc//third_party/cares:config_darwin/ares_config.h", - ":windows": "@com_github_grpc_grpc//third_party/cares:config_windows/ares_config.h", - ":android": "@com_github_grpc_grpc//third_party/cares:config_android/ares_config.h", - "//conditions:default": "@com_github_grpc_grpc//third_party/cares:config_linux/ares_config.h",