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-Core.podspec | |
| parent | aa2e731508de93c2756aac782f166598569ddc44 (diff) | |
| parent | 3f7e26e08588bcaceab674f1376d39d66cbaf71f (diff) | |
Merge with head and resolve conflict.
Diffstat (limited to 'gRPC-Core.podspec')
| -rw-r--r-- | gRPC-Core.podspec | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/gRPC-Core.podspec b/gRPC-Core.podspec index af7d270c20..0a78733f8d 100644 --- a/gRPC-Core.podspec +++ b/gRPC-Core.podspec @@ -1205,6 +1205,7 @@ Pod::Spec.new do |s| 'test/core/security/oauth2_utils.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', @@ -1232,6 +1233,7 @@ Pod::Spec.new do |s| 'test/core/security/oauth2_utils.h', 'test/core/end2end/cq_verifier.h', 'test/core/end2end/fixtures/http_proxy_fixture.h', + 'test/core/end2end/fixtures/local_util.h', 'test/core/end2end/fixtures/proxy.h', 'test/core/iomgr/endpoint_tests.h', 'test/core/util/debugger_macros.h', |