diff options
author | Yuchen Zeng <zyc@google.com> | 2017-02-08 20:15:20 -0800 |
---|---|---|
committer | Yuchen Zeng <zyc@google.com> | 2017-02-08 20:15:20 -0800 |
commit | f44e781d019a3b28903cc3970a33297e3ce4c2b5 (patch) | |
tree | 8b89d0a095efe39214b02a55b260a3b787d160c3 /binding.gyp | |
parent | ac8a0d238bb671e9b39930af41bbcda6c2475477 (diff) | |
parent | da7b06c2f8d0dd89ab92589c55d5233f329083c5 (diff) |
Merge remote-tracking branch 'upstream/master' into cares_bazel_rule
Diffstat (limited to 'binding.gyp')
-rw-r--r-- | binding.gyp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/binding.gyp b/binding.gyp index bb792fa326..08e9c73c44 100644 --- a/binding.gyp +++ b/binding.gyp @@ -712,6 +712,7 @@ 'src/core/lib/surface/server.c', 'src/core/lib/surface/validate_metadata.c', 'src/core/lib/surface/version.c', + 'src/core/lib/transport/bdp_estimator.c', 'src/core/lib/transport/byte_stream.c', 'src/core/lib/transport/connectivity_state.c', 'src/core/lib/transport/error_utils.c', @@ -762,6 +763,7 @@ 'src/core/lib/security/credentials/plugin/plugin_credentials.c', 'src/core/lib/security/credentials/ssl/ssl_credentials.c', 'src/core/lib/security/transport/client_auth_filter.c', + 'src/core/lib/security/transport/lb_targets_info.c', 'src/core/lib/security/transport/secure_endpoint.c', 'src/core/lib/security/transport/security_connector.c', 'src/core/lib/security/transport/security_handshaker.c', @@ -802,6 +804,7 @@ 'src/core/ext/transport/chttp2/client/insecure/channel_create.c', 'src/core/ext/transport/chttp2/client/insecure/channel_create_posix.c', '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', 'third_party/nanopb/pb_common.c', |