diff options
| author |  Muxi Yan <mxyan@google.com> | 2017-04-30 21:16:07 -0700 |
|---|---|---|
| committer | Muxi Yan <mxyan@google.com> | 2017-04-30 21:16:07 -0700 |
| commit | e123a059131116185fd9e3cfdd60a41144921468 (patch) | |
| tree | 21bf9d9d8628068592977da8cc19e5e248c413fd /binding.gyp | |
| parent | 286b696f81b2df28229918253c5311b5f1984ea3 (diff) | |
| parent | 365c52b47e8d322dfc0bdf15ddea2b598f3b4dbb (diff) | |
Merge remote-tracking branch 'upstream/master' into backward-compat
Diffstat (limited to 'binding.gyp')
| -rw-r--r-- | binding.gyp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/binding.gyp b/binding.gyp index 9bbfc5ab05..56354e7142 100644 --- a/binding.gyp +++ b/binding.gyp @@ -754,7 +754,7 @@ 'src/core/lib/surface/completion_queue.c', 'src/core/lib/surface/completion_queue_factory.c', 'src/core/lib/surface/event_string.c', - 'src/core/lib/surface/lame_client.c', + 'src/core/lib/surface/lame_client.cc', 'src/core/lib/surface/metadata_array.c', 'src/core/lib/surface/server.c', 'src/core/lib/surface/validate_metadata.c', @@ -826,6 +826,7 @@ 'src/core/tsi/fake_transport_security.c', 'src/core/tsi/ssl_transport_security.c', 'src/core/tsi/transport_security.c', + 'src/core/tsi/transport_security_adapter.c', 'src/core/ext/transport/chttp2/server/chttp2_server.c', 'src/core/ext/transport/chttp2/client/secure/secure_channel_create.c', 'src/core/ext/filters/client_channel/channel_connectivity.c', |