Upmerge from v1.3.x branch to master
diff --git a/BUILD b/BUILD
index 3e54e87..cc5fd3e 100644
--- a/BUILD
+++ b/BUILD
@@ -745,7 +745,7 @@
"grpc_transport_chttp2_server_insecure",
"grpc_workaround_cronet_compression_filter",
"grpc_server_backward_compatibility",
- ]
+ ],
)
grpc_cc_library(
@@ -1400,22 +1400,22 @@
grpc_cc_library(
name = "grpc++_base",
- hdrs = GRPCXX_HDRS,
srcs = GRPCXX_SRCS,
- public_hdrs = GRPCXX_PUBLIC_HDRS,
+ hdrs = GRPCXX_HDRS,
language = "c++",
+ public_hdrs = GRPCXX_PUBLIC_HDRS,
deps = [
- "grpc++_codegen_base",
"grpc",
+ "grpc++_codegen_base",
],
)
grpc_cc_library(
name = "grpc++_base_unsecure",
- hdrs = GRPCXX_HDRS,
srcs = GRPCXX_SRCS,
- public_hdrs = GRPCXX_PUBLIC_HDRS,
+ hdrs = GRPCXX_HDRS,
language = "c++",
+ public_hdrs = GRPCXX_PUBLIC_HDRS,
deps = [
"grpc++_codegen_base",
"grpc_unsecure",
@@ -1539,5 +1539,4 @@
],
)
-
grpc_generate_one_off_targets()