aboutsummaryrefslogtreecommitdiffhomepage
path: root/grpc.gyp
diff options
context:
space:
mode:
authorGravatar Craig Tiller <ctiller@google.com>2017-09-07 14:47:55 -0700
committerGravatar Craig Tiller <ctiller@google.com>2017-09-07 14:47:55 -0700
commit9e3af382fb93a2194f35986553d06931ba5adb90 (patch)
treef9e1cdae90e6dfe34cae62a4ac924913278c79ed /grpc.gyp
parente5a1b2b087c560b7c8ca3bd21a86875d502b1095 (diff)
parent8941f607d682d49f0b7c901bffd3e52941e4c5f9 (diff)
Merge github.com:grpc/grpc into stats_histo
Diffstat (limited to 'grpc.gyp')
-rw-r--r--grpc.gyp4
1 files changed, 4 insertions, 0 deletions
diff --git a/grpc.gyp b/grpc.gyp
index a7e4ab339a..0e7ee7e5c9 100644
--- a/grpc.gyp
+++ b/grpc.gyp
@@ -238,6 +238,7 @@
'src/core/lib/http/format_request.c',
'src/core/lib/http/httpcli.c',
'src/core/lib/http/parser.c',
+ 'src/core/lib/iomgr/call_combiner.c',
'src/core/lib/iomgr/closure.c',
'src/core/lib/iomgr/combiner.c',
'src/core/lib/iomgr/endpoint.c',
@@ -536,6 +537,7 @@
'src/core/lib/http/format_request.c',
'src/core/lib/http/httpcli.c',
'src/core/lib/http/parser.c',
+ 'src/core/lib/iomgr/call_combiner.c',
'src/core/lib/iomgr/closure.c',
'src/core/lib/iomgr/combiner.c',
'src/core/lib/iomgr/endpoint.c',
@@ -739,6 +741,7 @@
'src/core/lib/http/format_request.c',
'src/core/lib/http/httpcli.c',
'src/core/lib/http/parser.c',
+ 'src/core/lib/iomgr/call_combiner.c',
'src/core/lib/iomgr/closure.c',
'src/core/lib/iomgr/combiner.c',
'src/core/lib/iomgr/endpoint.c',
@@ -927,6 +930,7 @@
'src/core/lib/http/format_request.c',
'src/core/lib/http/httpcli.c',
'src/core/lib/http/parser.c',
+ 'src/core/lib/iomgr/call_combiner.c',
'src/core/lib/iomgr/closure.c',
'src/core/lib/iomgr/combiner.c',
'src/core/lib/iomgr/endpoint.c',