aboutsummaryrefslogtreecommitdiffhomepage
path: root/binding.gyp
diff options
context:
space:
mode:
authorGravatar David Garcia Quintas <dgq@google.com>2016-06-07 21:21:27 -0700
committerGravatar David Garcia Quintas <dgq@google.com>2016-06-07 21:21:27 -0700
commit533add5a8733a15f36bc03546dcab4312fd4365a (patch)
tree0b112923b795436944e01920829da106ceb953a1 /binding.gyp
parent8ba42bec907e3e9cebd2621127caac22aed30a0d (diff)
parentd30d4e279c4a63effaa6e912fc00bd4ad96054c7 (diff)
Merge branch 'master' of github.com:grpc/grpc into compression_md_level_bis
Diffstat (limited to 'binding.gyp')
-rw-r--r--binding.gyp4
1 files changed, 1 insertions, 3 deletions
diff --git a/binding.gyp b/binding.gyp
index b7bc89306a..d648de04d6 100644
--- a/binding.gyp
+++ b/binding.gyp
@@ -590,6 +590,7 @@
'src/core/lib/iomgr/iomgr.c',
'src/core/lib/iomgr/iomgr_posix.c',
'src/core/lib/iomgr/iomgr_windows.c',
+ 'src/core/lib/iomgr/polling_entity.c',
'src/core/lib/iomgr/pollset_set_windows.c',
'src/core/lib/iomgr/pollset_windows.c',
'src/core/lib/iomgr/resolve_address_posix.c',
@@ -718,9 +719,6 @@
'src/core/ext/client_config/uri_parser.c',
'src/core/ext/transport/chttp2/server/insecure/server_chttp2.c',
'src/core/ext/transport/chttp2/client/insecure/channel_create.c',
- 'src/core/ext/transport/cronet/client/secure/cronet_channel_create.c',
- 'src/core/ext/transport/cronet/transport/cronet_api_dummy.c',
- 'src/core/ext/transport/cronet/transport/cronet_transport.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',