diff options
| author |  Jan Tattermusch <jtattermusch@google.com> | 2015-08-14 09:58:54 -0700 |
|---|---|---|
| committer | Jan Tattermusch <jtattermusch@google.com> | 2015-08-14 09:58:54 -0700 |
| commit | d8fc8606740416b1cbe4d2f3754705b108fd2c5c (patch) | |
| tree | 594a4bd709532261bfbe66b93faea4cc0d4421c7 /gRPC.podspec | |
| parent | 46e85b02cda4ad4d549e444b78d1e74a3021a9d9 (diff) | |
| parent | 8d1c96f8bbfd6e78ce6264985d91f443d7619c2d (diff) | |
Merge remote-tracking branch 'upstream/master' into csharp_upgrade_to_proto3
Diffstat (limited to 'gRPC.podspec')
| -rw-r--r-- | gRPC.podspec | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/gRPC.podspec b/gRPC.podspec index 12ce7c1e7b..d945c299b5 100644 --- a/gRPC.podspec +++ b/gRPC.podspec @@ -73,7 +73,6 @@ Pod::Spec.new do |s| 'grpc/support/atm_gcc_atomic.h', 'grpc/support/atm_gcc_sync.h', 'grpc/support/atm_win32.h', - 'grpc/support/cancellable_platform.h', 'grpc/support/cmdline.h', 'grpc/support/cpu.h', 'grpc/support/histogram.h', @@ -97,7 +96,6 @@ Pod::Spec.new do |s| 'grpc/support/tls_pthread.h', 'grpc/support/useful.h', 'src/core/support/alloc.c', - 'src/core/support/cancellable.c', 'src/core/support/cmdline.c', 'src/core/support/cpu_iphone.c', 'src/core/support/cpu_linux.c', @@ -204,6 +202,7 @@ Pod::Spec.new do |s| 'src/core/iomgr/tcp_server.h', 'src/core/iomgr/tcp_windows.h', 'src/core/iomgr/time_averaged_stats.h', + 'src/core/iomgr/udp_server.h', 'src/core/iomgr/wakeup_fd_pipe.h', 'src/core/iomgr/wakeup_fd_posix.h', 'src/core/json/json.h', @@ -335,6 +334,7 @@ Pod::Spec.new do |s| 'src/core/iomgr/tcp_server_windows.c', 'src/core/iomgr/tcp_windows.c', 'src/core/iomgr/time_averaged_stats.c', + 'src/core/iomgr/udp_server.c', 'src/core/iomgr/wakeup_fd_eventfd.c', 'src/core/iomgr/wakeup_fd_nospecial.c', 'src/core/iomgr/wakeup_fd_pipe.c', @@ -471,6 +471,7 @@ Pod::Spec.new do |s| 'src/core/iomgr/tcp_server.h', 'src/core/iomgr/tcp_windows.h', 'src/core/iomgr/time_averaged_stats.h', + 'src/core/iomgr/udp_server.h', 'src/core/iomgr/wakeup_fd_pipe.h', 'src/core/iomgr/wakeup_fd_posix.h', 'src/core/json/json.h', |