diff options
author | David Garcia Quintas <dgq@google.com> | 2016-01-29 15:05:53 -0800 |
---|---|---|
committer | David Garcia Quintas <dgq@google.com> | 2016-01-29 15:05:53 -0800 |
commit | dd18c4a4a32f2038b16d22235e89c64a4ecb6b33 (patch) | |
tree | da88b22ea1ade0616c201b40c83199321114a5b3 /gRPC.podspec | |
parent | a4c9218889bdc1c90146d3ca179f2afc4d3c32f2 (diff) | |
parent | ed00b0366d9022bdfe47bbf4c0b4bff1bf03d195 (diff) |
Merge branch 'master' of github.com:grpc/grpc into grpclb_api
Diffstat (limited to 'gRPC.podspec')
-rw-r--r-- | gRPC.podspec | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/gRPC.podspec b/gRPC.podspec index c9ae79807c..9e199ef00a 100644 --- a/gRPC.podspec +++ b/gRPC.podspec @@ -101,6 +101,26 @@ Pod::Spec.new do |s| 'include/grpc/support/tls_msvc.h', 'include/grpc/support/tls_pthread.h', 'include/grpc/support/useful.h', + 'include/grpc/impl/codegen/alloc.h', + 'include/grpc/impl/codegen/atm.h', + 'include/grpc/impl/codegen/atm_gcc_atomic.h', + 'include/grpc/impl/codegen/atm_gcc_sync.h', + 'include/grpc/impl/codegen/atm_win32.h', + 'include/grpc/impl/codegen/byte_buffer.h', + 'include/grpc/impl/codegen/compression_types.h', + 'include/grpc/impl/codegen/connectivity_state.h', + 'include/grpc/impl/codegen/grpc_types.h', + 'include/grpc/impl/codegen/log.h', + 'include/grpc/impl/codegen/port_platform.h', + 'include/grpc/impl/codegen/propagation_bits.h', + 'include/grpc/impl/codegen/slice.h', + 'include/grpc/impl/codegen/slice_buffer.h', + 'include/grpc/impl/codegen/status.h', + 'include/grpc/impl/codegen/sync.h', + 'include/grpc/impl/codegen/sync_generic.h', + 'include/grpc/impl/codegen/sync_posix.h', + 'include/grpc/impl/codegen/sync_win32.h', + 'include/grpc/impl/codegen/time.h', 'src/core/profiling/basic_timers.c', 'src/core/profiling/stap_timers.c', 'src/core/support/alloc.c', @@ -602,7 +622,7 @@ Pod::Spec.new do |s| ss.requires_arc = false ss.libraries = 'z' - ss.dependency 'BoringSSL', '~> 1.0' + ss.dependency 'BoringSSL', '~> 2.0' # ss.compiler_flags = '-GCC_WARN_INHIBIT_ALL_WARNINGS', '-w' end |