Skip to content

Commit

Permalink
Merge github.com:grpc/grpc into cleaner-posix2
Browse files Browse the repository at this point in the history
  • Loading branch information
@ctiller
ctiller committed Mar 30, 2016
2 parents f45496f + e397074 commit e50d7be
Show file tree
Hide file tree
Showing 849 changed files with 3,546 additions and 875 deletions.
37 changes: 16 additions & 21 deletions BUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ package(default_visibility = ["//visibility:public"])




cc_library(
name = "gpr",
srcs = [
Expand Down Expand Up @@ -154,6 +155,7 @@ cc_library(
)



cc_library(
name = "grpc",
srcs = [
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand All @@ -484,13 +479,15 @@ cc_library(
"//external:libssl",
"//external:zlib",
":gpr",
"//external:nanopb",
],
copts = [
"-std=gnu99",
],
)



cc_library(
name = "grpc_codegen_lib",
srcs = [
Expand Down Expand Up @@ -527,6 +524,7 @@ cc_library(
)



cc_library(
name = "grpc_unsecure",
srcs = [
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand All @@ -820,13 +811,15 @@ cc_library(
],
deps = [
":gpr",
"//external:nanopb",
],
copts = [
"-std=gnu99",
],
)



cc_library(
name = "grpc_zookeeper",
srcs = [
Expand All @@ -847,6 +840,7 @@ cc_library(
)



cc_library(
name = "grpc++",
srcs = [
Expand Down Expand Up @@ -979,6 +973,7 @@ cc_library(
)



cc_library(
name = "grpc++_codegen_lib",
srcs = [
Expand Down Expand Up @@ -1042,10 +1037,12 @@ cc_library(
".",
],
deps = [
"//external:protobuf_clib",
],
)



cc_library(
name = "grpc++_unsecure",
srcs = [
Expand Down Expand Up @@ -1170,6 +1167,7 @@ cc_library(
)



cc_library(
name = "grpc_plugin_support",
srcs = [
Expand Down Expand Up @@ -1221,6 +1219,7 @@ cc_library(
)



cc_library(
name = "grpc_csharp_ext",
srcs = [
Expand All @@ -1240,6 +1239,7 @@ cc_library(




objc_library(
name = "gpr_objc",
srcs = [
Expand Down Expand Up @@ -1353,6 +1353,7 @@ objc_library(
)



objc_library(
name = "grpc_objc",
srcs = [
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand All @@ -1682,6 +1676,7 @@ objc_library(
deps = [
":gpr_objc",
"//external:libssl_objc",
"//external:nanopb",
],
sdk_dylibs = ["libz"],
)
Expand Down
Loading

0 comments on commit e50d7be

Please sign in to comment.