diff options
| author |  Vijay Pai <vpai@google.com> | 2018-02-02 11:23:22 -0800 |
|---|---|---|
| committer | Vijay Pai <vpai@google.com> | 2018-02-02 11:23:22 -0800 |
| commit | 08ce35de61e4397bf79e68b3203163a320e48461 (patch) | |
| tree | 3f92c2a3f3a41a2c1b669a1dc39be36b4366a944 /gRPC-C++.podspec | |
| parent | 4c0640ebd65f2661664f882c673707c1c5807ccd (diff) | |
| parent | c8e07c4964c98fb216dfcd562229ae515fc84a09 (diff) | |
Merge branch 'master' into gpr_review3
Diffstat (limited to 'gRPC-C++.podspec')
| -rw-r--r-- | gRPC-C++.podspec | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/gRPC-C++.podspec b/gRPC-C++.podspec index 117357fe91..f064b2ce3b 100644 --- a/gRPC-C++.podspec +++ b/gRPC-C++.podspec @@ -175,6 +175,7 @@ Pod::Spec.new do |s| 'src/cpp/client/create_channel_posix.cc', 'src/cpp/client/credentials_cc.cc', 'src/cpp/client/generic_stub.cc', + 'src/cpp/common/alarm.cc', 'src/cpp/common/channel_arguments.cc', 'src/cpp/common/channel_filter.cc', 'src/cpp/common/completion_queue_cc.cc', @@ -391,7 +392,6 @@ Pod::Spec.new do |s| 'src/core/lib/slice/slice_hash_table.h', 'src/core/lib/slice/slice_internal.h', 'src/core/lib/slice/slice_string_helpers.h', - 'src/core/lib/surface/alarm_internal.h', 'src/core/lib/surface/api_trace.h', 'src/core/lib/surface/call.h', 'src/core/lib/surface/call_test_only.h', @@ -563,7 +563,6 @@ Pod::Spec.new do |s| 'src/core/lib/slice/slice_hash_table.h', 'src/core/lib/slice/slice_internal.h', 'src/core/lib/slice/slice_string_helpers.h', - 'src/core/lib/surface/alarm_internal.h', 'src/core/lib/surface/api_trace.h', 'src/core/lib/surface/call.h', 'src/core/lib/surface/call_test_only.h', |