diff options
author | 2018-02-08 15:18:13 -0800 | |
---|---|---|
committer | 2018-02-08 15:18:13 -0800 | |
commit | 0693b72b7fdf7927ad120319ce53b4cf78cc11c9 (patch) | |
tree | 9af4eeefbf4e7c98ccd5264eb7280a26f637e18c /gRPC-Core.podspec | |
parent | 5122487fad891fdf5560122285c1690a06df73d2 (diff) | |
parent | bf19c3332161b26f3942ed7b3a711bdc4dd923bc (diff) |
Merge branch 'master' into gpr_review
Diffstat (limited to 'gRPC-Core.podspec')
-rw-r--r-- | gRPC-Core.podspec | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/gRPC-Core.podspec b/gRPC-Core.podspec index 95f5012baa..1798a0cbf0 100644 --- a/gRPC-Core.podspec +++ b/gRPC-Core.podspec @@ -126,10 +126,6 @@ Pod::Spec.new do |s| 'include/grpc/support/sync_windows.h', 'include/grpc/support/thd.h', 'include/grpc/support/time.h', - 'include/grpc/support/tls.h', - 'include/grpc/support/tls_gcc.h', - 'include/grpc/support/tls_msvc.h', - 'include/grpc/support/tls_pthread.h', 'include/grpc/impl/codegen/atm.h', 'include/grpc/impl/codegen/atm_gcc_atomic.h', 'include/grpc/impl/codegen/atm_gcc_sync.h', @@ -198,6 +194,10 @@ Pod::Spec.new do |s| 'src/core/lib/gpr/string_windows.h', 'src/core/lib/gpr/thd_internal.h', 'src/core/lib/gpr/time_precise.h', + 'src/core/lib/gpr/tls.h', + 'src/core/lib/gpr/tls_gcc.h', + 'src/core/lib/gpr/tls_msvc.h', + 'src/core/lib/gpr/tls_pthread.h', 'src/core/lib/gpr/tmpfile.h', 'src/core/lib/gpr/useful.h', 'src/core/lib/gprpp/abstract.h', @@ -674,7 +674,6 @@ Pod::Spec.new do |s| 'src/core/ext/filters/client_channel/proxy_mapper.cc', 'src/core/ext/filters/client_channel/proxy_mapper_registry.cc', 'src/core/ext/filters/client_channel/resolver.cc', - 'src/core/ext/filters/client_channel/resolver_factory.cc', 'src/core/ext/filters/client_channel/resolver_registry.cc', 'src/core/ext/filters/client_channel/retry_throttle.cc', 'src/core/ext/filters/client_channel/subchannel.cc', @@ -724,6 +723,10 @@ Pod::Spec.new do |s| 'src/core/lib/gpr/string_windows.h', 'src/core/lib/gpr/thd_internal.h', 'src/core/lib/gpr/time_precise.h', + 'src/core/lib/gpr/tls.h', + 'src/core/lib/gpr/tls_gcc.h', + 'src/core/lib/gpr/tls_msvc.h', + 'src/core/lib/gpr/tls_pthread.h', 'src/core/lib/gpr/tmpfile.h', 'src/core/lib/gpr/useful.h', 'src/core/lib/gprpp/abstract.h', |