diff options
| author |  Garrett Casto <gcasto@google.com> | 2016-10-17 09:56:43 -0700 |
|---|---|---|
| committer | Garrett Casto <gcasto@google.com> | 2016-10-17 09:56:43 -0700 |
| commit | 7ec31718f45d9ff227752a72bdcde693890676fb (patch) | |
| tree | 54bd9b8cbe246f3716ef9aa209ce424fb0010270 /Makefile | |
| parent | 37e3cc0c2ae0da0362f4799ada7e3416f1682919 (diff) | |
| parent | 062ba7b8baefdc76f74fffb9aa3e2134ba047ea6 (diff) | |
Merge remote-tracking branch 'upstream/master' into cronet_cpp_api
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -3081,6 +3081,7 @@ LIBGRPC_TEST_UTIL_SRC = \ test/core/end2end/data/test_root_cert.c \ test/core/security/oauth2_utils.c \ test/core/end2end/cq_verifier.c \ + test/core/end2end/fake_resolver.c \ test/core/end2end/fixtures/http_proxy.c \ test/core/end2end/fixtures/proxy.c \ test/core/iomgr/endpoint_tests.c \ @@ -3248,6 +3249,7 @@ endif LIBGRPC_TEST_UTIL_UNSECURE_SRC = \ test/core/end2end/cq_verifier.c \ + test/core/end2end/fake_resolver.c \ test/core/end2end/fixtures/http_proxy.c \ test/core/end2end/fixtures/proxy.c \ test/core/iomgr/endpoint_tests.c \ |