diff options
| author |  Craig Tiller <ctiller@google.com> | 2016-12-06 15:05:59 -0800 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2016-12-06 15:05:59 -0800 |
| commit | 397bff36b94bcb6d37c47c061b3bcc1e7c2d6a6d (patch) | |
| tree | 3c27de51b7ce79e41bb003350940b84e22d8334b /binding.gyp | |
| parent | 80a675005d4545cb50c54bc292339b69f2304b04 (diff) | |
| parent | 7c9076ab7a58fd7d120d3e0d6a58a3a253535185 (diff) | |
Merge github.com:grpc/grpc into slice_with_exec_ctx
Diffstat (limited to 'binding.gyp')
| -rw-r--r-- | binding.gyp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/binding.gyp b/binding.gyp index 28d7c6b9a5..516cbdce5d 100644 --- a/binding.gyp +++ b/binding.gyp @@ -716,9 +716,9 @@ '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/handshake.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', 'src/core/lib/security/transport/server_auth_filter.c', 'src/core/lib/security/transport/tsi_error.c', 'src/core/lib/security/util/b64.c', @@ -727,6 +727,7 @@ 'src/core/lib/tsi/fake_transport_security.c', 'src/core/lib/tsi/ssl_transport_security.c', 'src/core/lib/tsi/transport_security.c', + 'src/core/ext/transport/chttp2/server/chttp2_server.c', 'src/core/ext/transport/chttp2/client/secure/secure_channel_create.c', 'src/core/ext/client_channel/channel_connectivity.c', 'src/core/ext/client_channel/client_channel.c', @@ -746,6 +747,7 @@ 'src/core/ext/client_channel/subchannel.c', 'src/core/ext/client_channel/subchannel_index.c', 'src/core/ext/client_channel/uri_parser.c', + 'src/core/ext/transport/chttp2/client/chttp2_connector.c', 'src/core/ext/transport/chttp2/server/insecure/server_chttp2.c', 'src/core/ext/transport/chttp2/server/insecure/server_chttp2_posix.c', 'src/core/ext/transport/chttp2/client/insecure/channel_create.c', |