aboutsummaryrefslogtreecommitdiffhomepage
path: root/BUILD
diff options
context:
space:
mode:
authorGravatar Muxi Yan <mxyan@google.com>2017-02-14 09:32:21 -0800
committerGravatar Muxi Yan <mxyan@google.com>2017-02-14 09:32:21 -0800
commitccbfb461d0a6b6b1785e17b4a5b9f92f789af8e3 (patch)
treed5d5dd28a5eedaff378ff31c7d9b7aa14d94ddba /BUILD
parente1cf1b691d3e82742214c8772a71e79e3209c2ce (diff)
parent09173c66f446a465aa8bae76926f2807f76fc795 (diff)
Merge remote-tracking branch 'upstream/master' into packet-coalescing-core
Diffstat (limited to 'BUILD')
-rw-r--r--BUILD71
1 files changed, 54 insertions, 17 deletions
diff --git a/BUILD b/BUILD
index 05359df444..aa12700818 100644
--- a/BUILD
+++ b/BUILD
@@ -63,7 +63,7 @@ grpc_cc_library(
deps = [
"census",
"grpc_base",
- "grpc_lb_policy_grpclb",
+ "grpc_lb_policy_grpclb_secure",
"grpc_lb_policy_pick_first",
"grpc_lb_policy_round_robin",
"grpc_load_reporting",
@@ -140,6 +140,7 @@ grpc_cc_library(
"grpc++_base",
"grpc++_codegen_base",
"grpc++_codegen_base_src",
+ "grpc++_codegen_proto",
],
)
@@ -284,9 +285,15 @@ grpc_cc_library(
"src/core/ext/census/resource.h",
"src/core/ext/census/rpc_metric_id.h",
"src/core/ext/census/trace_context.h",
+ "src/core/ext/census/trace_label.h",
+ "src/core/ext/census/trace_propagation.h",
+ "src/core/ext/census/trace_status.h",
+ "src/core/ext/census/trace_string.h",
+ "src/core/ext/census/tracing.h",
],
external_deps = [
"nanopb",
+ "libssl",
],
language = "c",
public_hdrs = [
@@ -526,6 +533,7 @@ grpc_cc_library(
"src/core/lib/transport/metadata.c",
"src/core/lib/transport/metadata_batch.c",
"src/core/lib/transport/pid_controller.c",
+ "src/core/lib/transport/bdp_estimator.c",
"src/core/lib/transport/service_config.c",
"src/core/lib/transport/static_metadata.c",
"src/core/lib/transport/status_conversion.c",
@@ -623,9 +631,9 @@ grpc_cc_library(
"src/core/lib/surface/completion_queue.h",
"src/core/lib/surface/event_string.h",
"src/core/lib/surface/init.h",
- "src/core/lib/surface/validate_metadata.h",
"src/core/lib/surface/lame_client.h",
"src/core/lib/surface/server.h",
+ "src/core/lib/surface/validate_metadata.h",
"src/core/lib/transport/byte_stream.h",
"src/core/lib/transport/connectivity_state.h",
"src/core/lib/transport/error_utils.h",
@@ -633,6 +641,7 @@ grpc_cc_library(
"src/core/lib/transport/metadata.h",
"src/core/lib/transport/metadata_batch.h",
"src/core/lib/transport/pid_controller.h",
+ "src/core/lib/transport/bdp_estimator.h",
"src/core/lib/transport/service_config.h",
"src/core/lib/transport/static_metadata.h",
"src/core/lib/transport/status_conversion.h",
@@ -663,7 +672,6 @@ grpc_cc_library(
grpc_cc_library(
name = "grpc_client_channel",
- language = "c",
srcs = [
"src/core/ext/client_channel/channel_connectivity.c",
"src/core/ext/client_channel/client_channel.c",
@@ -707,6 +715,7 @@ grpc_cc_library(
"src/core/ext/client_channel/subchannel_index.h",
"src/core/ext/client_channel/uri_parser.h",
],
+ language = "c",
deps = [
"grpc_base",
],
@@ -733,11 +742,13 @@ grpc_cc_library(
name = "grpc_lb_policy_grpclb",
srcs = [
"src/core/ext/lb_policy/grpclb/grpclb.c",
+ "src/core/ext/lb_policy/grpclb/grpclb_channel.c",
"src/core/ext/lb_policy/grpclb/load_balancer_api.c",
"src/core/ext/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.c",
],
hdrs = [
"src/core/ext/lb_policy/grpclb/grpclb.h",
+ "src/core/ext/lb_policy/grpclb/grpclb_channel.h",
"src/core/ext/lb_policy/grpclb/load_balancer_api.h",
"src/core/ext/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.h",
],
@@ -752,6 +763,31 @@ grpc_cc_library(
)
grpc_cc_library(
+ name = "grpc_lb_policy_grpclb_secure",
+ srcs = [
+ "src/core/ext/lb_policy/grpclb/grpclb.c",
+ "src/core/ext/lb_policy/grpclb/grpclb_channel_secure.c",
+ "src/core/ext/lb_policy/grpclb/load_balancer_api.c",
+ "src/core/ext/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.c",
+ ],
+ hdrs = [
+ "src/core/ext/lb_policy/grpclb/grpclb.h",
+ "src/core/ext/lb_policy/grpclb/grpclb_channel.h",
+ "src/core/ext/lb_policy/grpclb/load_balancer_api.h",
+ "src/core/ext/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.h",
+ ],
+ external_deps = [
+ "nanopb",
+ ],
+ language = "c",
+ deps = [
+ "grpc_base",
+ "grpc_client_channel",
+ "grpc_secure",
+ ],
+)
+
+grpc_cc_library(
name = "grpc_lb_policy_pick_first",
srcs = [
"src/core/ext/lb_policy/pick_first/pick_first.c",
@@ -835,6 +871,7 @@ grpc_cc_library(
"src/core/lib/security/credentials/ssl/ssl_credentials.c",
"src/core/lib/security/transport/client_auth_filter.c",
"src/core/lib/security/transport/secure_endpoint.c",
+ "src/core/lib/security/transport/lb_targets_info.c",
"src/core/lib/security/transport/security_connector.c",
"src/core/lib/security/transport/security_handshaker.c",
"src/core/lib/security/transport/server_auth_filter.c",
@@ -858,6 +895,7 @@ grpc_cc_library(
"src/core/lib/security/credentials/ssl/ssl_credentials.h",
"src/core/lib/security/transport/auth_filters.h",
"src/core/lib/security/transport/secure_endpoint.h",
+ "src/core/lib/security/transport/lb_targets_info.h",
"src/core/lib/security/transport/security_connector.h",
"src/core/lib/security/transport/security_handshaker.h",
"src/core/lib/security/transport/tsi_error.h",
@@ -941,22 +979,21 @@ grpc_cc_library(
)
grpc_cc_library(
- name = "grpc_transport_chttp2_client_connector",
- hdrs = [
- "src/core/ext/transport/chttp2/client/chttp2_connector.h",
- ],
- srcs = [
- "src/core/ext/transport/chttp2/client/chttp2_connector.c",
- ],
- language = "c",
- deps = [
- "grpc_transport_chttp2",
- "grpc_base",
- "grpc_client_channel",
- ],
+ name = "grpc_transport_chttp2_client_connector",
+ srcs = [
+ "src/core/ext/transport/chttp2/client/chttp2_connector.c",
+ ],
+ hdrs = [
+ "src/core/ext/transport/chttp2/client/chttp2_connector.h",
+ ],
+ language = "c",
+ deps = [
+ "grpc_base",
+ "grpc_client_channel",
+ "grpc_transport_chttp2",
+ ],
)
-
grpc_cc_library(
name = "grpc_transport_chttp2_client_insecure",
srcs = [