diff options
author | David Garcia Quintas <dgq@google.com> | 2016-07-14 11:38:38 -0700 |
---|---|---|
committer | David Garcia Quintas <dgq@google.com> | 2016-07-14 14:13:41 -0700 |
commit | 7c3ba12813e967b9383a73b6a621eccd9b3e706d (patch) | |
tree | 089cd9d41a86ed1db58fd5cce58bbd4cfe1404be /binding.gyp | |
parent | 78fbb0a3017ebf772757848336e4db706a1b234e (diff) | |
parent | bda40a0301de58305cebe025a885852686e4391a (diff) |
Merge branch 'master' of github.com:grpc/grpc into grpclb_v0
Diffstat (limited to 'binding.gyp')
-rw-r--r-- | binding.gyp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/binding.gyp b/binding.gyp index 9b536d6434..c39afe2864 100644 --- a/binding.gyp +++ b/binding.gyp @@ -581,6 +581,7 @@ 'src/core/lib/iomgr/endpoint_pair_posix.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_poll_and_epoll_posix.c', 'src/core/lib/iomgr/ev_poll_posix.c', 'src/core/lib/iomgr/ev_posix.c', @@ -591,6 +592,7 @@ 'src/core/lib/iomgr/iomgr_posix.c', 'src/core/lib/iomgr/iomgr_windows.c', 'src/core/lib/iomgr/load_file.c', + 'src/core/lib/iomgr/network_status_tracker.c', 'src/core/lib/iomgr/polling_entity.c', 'src/core/lib/iomgr/pollset_set_windows.c', 'src/core/lib/iomgr/pollset_windows.c', |