diff options
| author |  Craig Tiller <ctiller@google.com> | 2017-10-15 22:22:27 +0000 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2017-10-15 22:22:27 +0000 |
| commit | 1406f9c524029b5725dfc578551366e54c6494fb (patch) | |
| tree | d9cfbd7df1cdcc6655717837749704724b25dc4b /grpc.gyp | |
| parent | ad059f70f8bccee3ae1a0ef1568c8d89c0c1004d (diff) | |
| parent | 742ca098191c69ff23bf76b47989f21809c09cc3 (diff) | |
Merge branch 'bs2' into epexinf
Diffstat (limited to 'grpc.gyp')
| -rw-r--r-- | grpc.gyp | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -515,7 +515,7 @@ 'test/core/end2end/fixtures/http_proxy_fixture.c', 'test/core/end2end/fixtures/proxy.c', 'test/core/iomgr/endpoint_tests.c', - 'test/core/util/debugger_macros.c', + 'test/core/util/debugger_macros.cc', 'test/core/util/grpc_profiler.c', 'test/core/util/memory_counters.c', 'test/core/util/mock_endpoint.c', @@ -722,7 +722,7 @@ 'test/core/end2end/fixtures/http_proxy_fixture.c', 'test/core/end2end/fixtures/proxy.c', 'test/core/iomgr/endpoint_tests.c', - 'test/core/util/debugger_macros.c', + 'test/core/util/debugger_macros.cc', 'test/core/util/grpc_profiler.c', 'test/core/util/memory_counters.c', 'test/core/util/mock_endpoint.c', |