diff options
author | Craig Tiller <ctiller@google.com> | 2017-11-28 11:38:55 -0800 |
---|---|---|
committer | Craig Tiller <ctiller@google.com> | 2017-11-28 11:38:55 -0800 |
commit | 84e379ae85460eb6857d4131eb89699feef716d8 (patch) | |
tree | 4af9e833ad1f523d12a6bd9972e328b52b9e554e /grpc.gyp | |
parent | 348b334f4b3545a89372652b47ee7030502910d0 (diff) | |
parent | 1972e5ce741dab2ffe671e0dfde00288005f19f4 (diff) |
Merge github.com:grpc/grpc into no-absl
Diffstat (limited to 'grpc.gyp')
-rw-r--r-- | grpc.gyp | 6 |
1 files changed, 2 insertions, 4 deletions
@@ -242,7 +242,6 @@ 'src/core/lib/http/httpcli.cc', 'src/core/lib/http/parser.cc', 'src/core/lib/iomgr/call_combiner.cc', - 'src/core/lib/iomgr/closure.cc', 'src/core/lib/iomgr/combiner.cc', 'src/core/lib/iomgr/endpoint.cc', 'src/core/lib/iomgr/endpoint_pair_posix.cc', @@ -512,6 +511,7 @@ 'test/core/util/port.cc', 'test/core/util/port_server_client.cc', 'test/core/util/slice_splitter.cc', + 'test/core/util/tracer_util.cc', 'test/core/util/trickle_endpoint.cc', 'src/core/lib/backoff/backoff.cc', 'src/core/lib/channel/channel_args.cc', @@ -532,7 +532,6 @@ 'src/core/lib/http/httpcli.cc', 'src/core/lib/http/parser.cc', 'src/core/lib/iomgr/call_combiner.cc', - 'src/core/lib/iomgr/closure.cc', 'src/core/lib/iomgr/combiner.cc', 'src/core/lib/iomgr/endpoint.cc', 'src/core/lib/iomgr/endpoint_pair_posix.cc', @@ -720,6 +719,7 @@ 'test/core/util/port.cc', 'test/core/util/port_server_client.cc', 'test/core/util/slice_splitter.cc', + 'test/core/util/tracer_util.cc', 'test/core/util/trickle_endpoint.cc', 'src/core/lib/backoff/backoff.cc', 'src/core/lib/channel/channel_args.cc', @@ -740,7 +740,6 @@ 'src/core/lib/http/httpcli.cc', 'src/core/lib/http/parser.cc', 'src/core/lib/iomgr/call_combiner.cc', - 'src/core/lib/iomgr/closure.cc', 'src/core/lib/iomgr/combiner.cc', 'src/core/lib/iomgr/endpoint.cc', 'src/core/lib/iomgr/endpoint_pair_posix.cc', @@ -933,7 +932,6 @@ 'src/core/lib/http/httpcli.cc', 'src/core/lib/http/parser.cc', 'src/core/lib/iomgr/call_combiner.cc', - 'src/core/lib/iomgr/closure.cc', 'src/core/lib/iomgr/combiner.cc', 'src/core/lib/iomgr/endpoint.cc', 'src/core/lib/iomgr/endpoint_pair_posix.cc', |