Merge github.com:grpc/grpc into cleaner-posix2

1 files changed, 16 insertions, 21 deletions

diff --git a/BUILD b/BUILD
index 64a293ed34..7f4ef26144 100644
--- a/BUILD
+++ b/BUILD
@@ -41,6 +41,7 @@ package(default_visibility = ["//visibility:public"])
 
 
 
+
 cc_library(
   name = "gpr",
   srcs = [
@@ -154,6 +155,7 @@ cc_library(
 )
 
 
+
 cc_library(
   name = "grpc",
   srcs = [
@@ -295,10 +297,6 @@ cc_library(
     "src/core/lib/tsi/ssl_types.h",
     "src/core/lib/tsi/transport_security.h",
     "src/core/lib/tsi/transport_security_interface.h",
-    "third_party/nanopb/pb.h",
-    "third_party/nanopb/pb_common.h",
-    "third_party/nanopb/pb_decode.h",
-    "third_party/nanopb/pb_encode.h",
     "src/core/ext/transport/chttp2/client/insecure/channel_create.c",
     "src/core/ext/transport/chttp2/client/secure/secure_channel_create.c",
     "src/core/ext/transport/chttp2/server/insecure/server_chttp2.c",
@@ -457,9 +455,6 @@ cc_library(
     "src/core/lib/tsi/fake_transport_security.c",
     "src/core/lib/tsi/ssl_transport_security.c",
     "src/core/lib/tsi/transport_security.c",
-    "third_party/nanopb/pb_common.c",
-    "third_party/nanopb/pb_decode.c",
-    "third_party/nanopb/pb_encode.c",
   ],
   hdrs = [
     "include/grpc/byte_buffer.h",
@@ -484,6 +479,7 @@ cc_library(
     "//external:libssl",
     "//external:zlib",
     ":gpr",
+    "//external:nanopb",
   ],
   copts = [
     "-std=gnu99",
@@ -491,6 +487,7 @@ cc_library(
 )
 
 
+
 cc_library(
   name = "grpc_codegen_lib",
   srcs = [
@@ -527,6 +524,7 @@ cc_library(
 )
 
 
+
 cc_library(
   name = "grpc_unsecure",
   srcs = [
@@ -654,10 +652,6 @@ cc_library(
     "src/core/lib/transport/static_metadata.h",
     "src/core/lib/transport/transport.h",
     "src/core/lib/transport/transport_impl.h",
-    "third_party/nanopb/pb.h",
-    "third_party/nanopb/pb_common.h",
-    "third_party/nanopb/pb_decode.h",
-    "third_party/nanopb/pb_encode.h",
     "src/core/ext/transport/chttp2/client/insecure/channel_create.c",
     "src/core/ext/transport/chttp2/server/insecure/server_chttp2.c",
     "src/core/ext/transport/chttp2/transport/alpn.c",
@@ -796,9 +790,6 @@ cc_library(
     "src/core/lib/transport/static_metadata.c",
     "src/core/lib/transport/transport.c",
     "src/core/lib/transport/transport_op_string.c",
-    "third_party/nanopb/pb_common.c",
-    "third_party/nanopb/pb_decode.c",
-    "third_party/nanopb/pb_encode.c",
   ],
   hdrs = [
     "include/grpc/byte_buffer.h",
@@ -820,6 +811,7 @@ cc_library(
   ],
   deps = [
     ":gpr",
+    "//external:nanopb",
   ],
   copts = [
     "-std=gnu99",
@@ -827,6 +819,7 @@ cc_library(
 )
 
 
+
 cc_library(
   name = "grpc_zookeeper",
   srcs = [
@@ -847,6 +840,7 @@ cc_library(
 )
 
 
+
 cc_library(
   name = "grpc++",
   srcs = [
@@ -979,6 +973,7 @@ cc_library(
 )
 
 
+
 cc_library(
   name = "grpc++_codegen_lib",
   srcs = [
@@ -1042,10 +1037,12 @@ cc_library(
     ".",
   ],
   deps = [
+    "//external:protobuf_clib",
   ],
 )
 
 
+
 cc_library(
   name = "grpc++_unsecure",
   srcs = [
@@ -1170,6 +1167,7 @@ cc_library(
 )
 
 
+
 cc_library(
   name = "grpc_plugin_support",
   srcs = [
@@ -1221,6 +1219,7 @@ cc_library(
 )
 
 
+
 cc_library(
   name = "grpc_csharp_ext",
   srcs = [
@@ -1240,6 +1239,7 @@ cc_library(
 
 
 
+
 objc_library(
   name = "gpr_objc",
   srcs = [
@@ -1353,6 +1353,7 @@ objc_library(
 )
 
 
+
 objc_library(
   name = "grpc_objc",
   srcs = [
@@ -1514,9 +1515,6 @@ objc_library(
     "src/core/lib/tsi/fake_transport_security.c",
     "src/core/lib/tsi/ssl_transport_security.c",
     "src/core/lib/tsi/transport_security.c",
-    "third_party/nanopb/pb_common.c",
-    "third_party/nanopb/pb_decode.c",
-    "third_party/nanopb/pb_encode.c",
   ],
   hdrs = [
     "include/grpc/byte_buffer.h",
@@ -1670,10 +1668,6 @@ objc_library(
     "src/core/lib/tsi/ssl_types.h",
     "src/core/lib/tsi/transport_security.h",
     "src/core/lib/tsi/transport_security_interface.h",
-    "third_party/nanopb/pb.h",
-    "third_party/nanopb/pb_common.h",
-    "third_party/nanopb/pb_decode.h",
-    "third_party/nanopb/pb_encode.h",
   ],
   includes = [
     "include",
@@ -1682,6 +1676,7 @@ objc_library(
   deps = [
     ":gpr_objc",
     "//external:libssl_objc",
+    "//external:nanopb",
   ],
   sdk_dylibs = ["libz"],
 )