diff options
author | A. Unique TensorFlower <gardener@tensorflow.org> | 2017-11-13 14:21:04 -0800 |
---|---|---|
committer | TensorFlower Gardener <gardener@tensorflow.org> | 2017-11-13 14:25:14 -0800 |
commit | 061c3597b84d45a9878b8adf831e39a5573859ec (patch) | |
tree | 333b9ddfc726893ebd76dee22129321a7fba52bc /third_party/grpc | |
parent | 9642c1c0164ac87acfff2d52f82626eb38667dd8 (diff) |
Upgrade gRPC version used in OSS. Fix-forward of #14262. Remove namespace-compatibility hack.
PiperOrigin-RevId: 175586521
Diffstat (limited to 'third_party/grpc')
-rw-r--r-- | third_party/grpc/grpc.patch | 105 |
1 files changed, 0 insertions, 105 deletions
diff --git a/third_party/grpc/grpc.patch b/third_party/grpc/grpc.patch deleted file mode 100644 index c06d9b8aaf..0000000000 --- a/third_party/grpc/grpc.patch +++ /dev/null @@ -1,105 +0,0 @@ -diff --git a/BUILD b/BUILD -index 6552d5879e..59adb1ce1c 100644 ---- a/BUILD -+++ b/BUILD -@@ -287,6 +287,7 @@ grpc_cc_library( - "grpc++_base_unsecure", - "grpc++_codegen_base", - "grpc++_codegen_base_src", -+ "grpc++_codegen_proto", - "grpc_unsecure", - ], - ) -@@ -1519,13 +1520,13 @@ grpc_cc_library( - - grpc_cc_library( - name = "grpc++_config_proto", -- external_deps = [ -- "protobuf", -- ], - language = "c++", - public_hdrs = [ - "include/grpc++/impl/codegen/config_protobuf.h", - ], -+ deps = [ -+ "@protobuf_archive//:protobuf_headers", -+ ], - ) - - grpc_cc_library( -diff --git a/bazel/grpc_build_system.bzl b/bazel/grpc_build_system.bzl -index f793cae56d..0295adb8ab 100644 ---- a/bazel/grpc_build_system.bzl -+++ b/bazel/grpc_build_system.bzl -@@ -80,7 +80,7 @@ def grpc_cc_test(name, srcs = [], deps = [], external_deps = [], args = [], data - linkopts = ["-pthread"], - ) - --def grpc_cc_binary(name, srcs = [], deps = [], external_deps = [], args = [], data = [], language = "C++", testonly = False, linkshared = False): -+def grpc_cc_binary(name, srcs = [], deps = [], external_deps = [], args = [], data = [], language = "C++", testonly = False, linkshared = False, linkopts = []): - copts = [] - if language.upper() == "C": - copts = ["-std=c99"] -@@ -93,7 +93,7 @@ def grpc_cc_binary(name, srcs = [], deps = [], external_deps = [], args = [], da - linkshared = linkshared, - deps = deps + ["//external:" + dep for dep in external_deps], - copts = copts, -- linkopts = ["-pthread"], -+ linkopts = ["-pthread"] + linkopts, - ) - - def grpc_generate_one_off_targets(): -diff --git a/src/core/plugin_registry/grpc_unsecure_plugin_registry.c b/src/core/plugin_registry/grpc_unsecure_plugin_registry.c -index 7eb599d81a..4cc2e30af4 100644 ---- a/src/core/plugin_registry/grpc_unsecure_plugin_registry.c -+++ b/src/core/plugin_registry/grpc_unsecure_plugin_registry.c -@@ -28,18 +28,12 @@ extern void grpc_client_channel_init(void); - extern void grpc_client_channel_shutdown(void); - extern void grpc_inproc_plugin_init(void); - extern void grpc_inproc_plugin_shutdown(void); --extern void grpc_resolver_dns_ares_init(void); --extern void grpc_resolver_dns_ares_shutdown(void); - extern void grpc_resolver_dns_native_init(void); - extern void grpc_resolver_dns_native_shutdown(void); - extern void grpc_resolver_sockaddr_init(void); - extern void grpc_resolver_sockaddr_shutdown(void); --extern void grpc_resolver_fake_init(void); --extern void grpc_resolver_fake_shutdown(void); - extern void grpc_load_reporting_plugin_init(void); - extern void grpc_load_reporting_plugin_shutdown(void); --extern void grpc_lb_policy_grpclb_init(void); --extern void grpc_lb_policy_grpclb_shutdown(void); - extern void grpc_lb_policy_pick_first_init(void); - extern void grpc_lb_policy_pick_first_shutdown(void); - extern void grpc_lb_policy_round_robin_init(void); -@@ -64,18 +58,12 @@ void grpc_register_built_in_plugins(void) { - grpc_client_channel_shutdown); - grpc_register_plugin(grpc_inproc_plugin_init, - grpc_inproc_plugin_shutdown); -- grpc_register_plugin(grpc_resolver_dns_ares_init, -- grpc_resolver_dns_ares_shutdown); - grpc_register_plugin(grpc_resolver_dns_native_init, - grpc_resolver_dns_native_shutdown); - grpc_register_plugin(grpc_resolver_sockaddr_init, - grpc_resolver_sockaddr_shutdown); -- grpc_register_plugin(grpc_resolver_fake_init, -- grpc_resolver_fake_shutdown); - grpc_register_plugin(grpc_load_reporting_plugin_init, - grpc_load_reporting_plugin_shutdown); -- grpc_register_plugin(grpc_lb_policy_grpclb_init, -- grpc_lb_policy_grpclb_shutdown); - grpc_register_plugin(grpc_lb_policy_pick_first_init, - grpc_lb_policy_pick_first_shutdown); - grpc_register_plugin(grpc_lb_policy_round_robin_init, -diff --git a/test/cpp/util/BUILD b/test/cpp/util/BUILD -index 33240f6f69..d2e1f67f06 100644 ---- a/test/cpp/util/BUILD -+++ b/test/cpp/util/BUILD -@@ -29,6 +29,7 @@ package( - grpc_cc_binary( - name = "testso.so", - srcs = [], -+ linkopts = ['-Wl,--no-undefined'], - linkshared = 1, - deps = ["//:grpc++_unsecure"], - ) |