diff options
| author |  Craig Tiller <ctiller@google.com> | 2017-05-01 14:26:49 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2017-05-01 14:26:49 -0700 |
| commit | c610985aeb3931c53726e742707aa1a8b2fe84b9 (patch) | |
| tree | 586cddcd4ed8380f659c681f9c5a4010553cffb0 /binding.gyp | |
| parent | b72a74ae039d666cf6cfc60477289c03dc5b5933 (diff) | |
| parent | 50da5ec21d3d8be5e76b9809242821f9e5badba1 (diff) | |
Merge branch 'hiertune' into epex4+epoll1
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 15c28e655b..ccc5ad32f2 100644 --- a/binding.gyp +++ b/binding.gyp @@ -672,8 +672,9 @@ 'src/core/lib/iomgr/endpoint_pair_uv.c', 'src/core/lib/iomgr/endpoint_pair_windows.c', 'src/core/lib/iomgr/error.c', - 'src/core/lib/iomgr/ev_epoll_linux.c', + 'src/core/lib/iomgr/ev_epoll1_linux.c', 'src/core/lib/iomgr/ev_epollex_linux.c', + 'src/core/lib/iomgr/ev_epollsig_linux.c', 'src/core/lib/iomgr/ev_poll_posix.c', 'src/core/lib/iomgr/ev_posix.c', 'src/core/lib/iomgr/exec_ctx.c', @@ -828,6 +829,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', |