diff options
| author |  yang-g <yangg@google.com> | 2018-12-17 11:54:03 -0800 |
|---|---|---|
| committer | yang-g <yangg@google.com> | 2018-12-17 11:54:10 -0800 |
| commit | a303a28895c28a485665fbd617af0025eac7f452 (patch) | |
| tree | fd77c6095f6fcf22856a857cf729b04cbd372e1e /grpc.gyp | |
| parent | aa2e731508de93c2756aac782f166598569ddc44 (diff) | |
| parent | 3f7e26e08588bcaceab674f1376d39d66cbaf71f (diff) | |
Merge with head and resolve conflict.
Diffstat (limited to 'grpc.gyp')
| -rw-r--r-- | grpc.gyp | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -606,6 +606,7 @@ 'src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc', 'test/core/end2end/cq_verifier.cc', 'test/core/end2end/fixtures/http_proxy_fixture.cc', + 'test/core/end2end/fixtures/local_util.cc', 'test/core/end2end/fixtures/proxy.cc', 'test/core/iomgr/endpoint_tests.cc', 'test/core/util/debugger_macros.cc', @@ -846,6 +847,7 @@ 'src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc', 'test/core/end2end/cq_verifier.cc', 'test/core/end2end/fixtures/http_proxy_fixture.cc', + 'test/core/end2end/fixtures/local_util.cc', 'test/core/end2end/fixtures/proxy.cc', 'test/core/iomgr/endpoint_tests.cc', 'test/core/util/debugger_macros.cc', |