diff options
| author |  David Garcia Quintas <dgq@google.com> | 2015-10-13 16:17:26 -0700 |
|---|---|---|
| committer | David Garcia Quintas <dgq@google.com> | 2015-10-13 16:17:26 -0700 |
| commit | 0fe72429a03dd1ac6081ee8efe8fe7b85da7bef3 (patch) | |
| tree | e18efd405fce4cb017105fedf9e1cef5585824e0 /gRPC.podspec | |
| parent | 7b1bd2c2713c9d505094ab728a08d4c94f15c6fa (diff) | |
| parent | bee8f104c0827bc829402d79c8302835adfc37f9 (diff) | |
Merge branch 'master' of github.com:grpc/grpc into microchannels
Diffstat (limited to 'gRPC.podspec')
| -rw-r--r-- | gRPC.podspec | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/gRPC.podspec b/gRPC.podspec index f79a1b7599..93a6e64da1 100644 --- a/gRPC.podspec +++ b/gRPC.podspec @@ -63,7 +63,8 @@ Pod::Spec.new do |s| # Core cross-platform gRPC library, written in C. s.subspec 'C-Core' do |ss| - ss.source_files = 'src/core/support/block_annotate.h', + ss.source_files = 'src/core/profiling/timers.h', + 'src/core/support/block_annotate.h', 'src/core/support/env.h', 'src/core/support/file.h', 'src/core/support/murmur_hash.h', @@ -99,6 +100,8 @@ Pod::Spec.new do |s| 'grpc/support/tls_msvc.h', 'grpc/support/tls_pthread.h', 'grpc/support/useful.h', + 'src/core/profiling/basic_timers.c', + 'src/core/profiling/stap_timers.c', 'src/core/support/alloc.c', 'src/core/support/cmdline.c', 'src/core/support/cpu_iphone.c', @@ -134,6 +137,7 @@ Pod::Spec.new do |s| 'src/core/support/thd_win32.c', 'src/core/support/time.c', 'src/core/support/time_posix.c', + 'src/core/support/time_precise.c', 'src/core/support/time_win32.c', 'src/core/support/tls_pthread.c', 'src/core/security/auth_filters.h', @@ -222,12 +226,12 @@ Pod::Spec.new do |s| 'src/core/json/json_common.h', 'src/core/json/json_reader.h', 'src/core/json/json_writer.h', - 'src/core/profiling/timers.h', 'src/core/statistics/census_interface.h', 'src/core/statistics/census_rpc_stats.h', 'src/core/surface/api_trace.h', 'src/core/surface/byte_buffer_queue.h', 'src/core/surface/call.h', + 'src/core/surface/call_test_only.h', 'src/core/surface/channel.h', 'src/core/surface/completion_queue.h', 'src/core/surface/event_string.h', @@ -368,8 +372,6 @@ Pod::Spec.new do |s| 'src/core/json/json_reader.c', 'src/core/json/json_string.c', 'src/core/json/json_writer.c', - 'src/core/profiling/basic_timers.c', - 'src/core/profiling/stap_timers.c', 'src/core/surface/api_trace.c', 'src/core/surface/byte_buffer.c', 'src/core/surface/byte_buffer_queue.c', @@ -420,7 +422,8 @@ Pod::Spec.new do |s| 'src/core/census/operation.c', 'src/core/census/tracing.c' - ss.private_header_files = 'src/core/support/block_annotate.h', + ss.private_header_files = 'src/core/profiling/timers.h', + 'src/core/support/block_annotate.h', 'src/core/support/env.h', 'src/core/support/file.h', 'src/core/support/murmur_hash.h', @@ -515,12 +518,12 @@ Pod::Spec.new do |s| 'src/core/json/json_common.h', 'src/core/json/json_reader.h', 'src/core/json/json_writer.h', - 'src/core/profiling/timers.h', 'src/core/statistics/census_interface.h', 'src/core/statistics/census_rpc_stats.h', 'src/core/surface/api_trace.h', 'src/core/surface/byte_buffer_queue.h', 'src/core/surface/call.h', + 'src/core/surface/call_test_only.h', 'src/core/surface/channel.h', 'src/core/surface/completion_queue.h', 'src/core/surface/event_string.h', |