diff options
| author |  David Garcia Quintas <dgq@google.com> | 2016-05-12 14:28:36 -0700 |
|---|---|---|
| committer | David Garcia Quintas <dgq@google.com> | 2016-05-12 14:28:36 -0700 |
| commit | 6d0b4d20c0dbb9326724343a0c04b52d390e25a4 (patch) | |
| tree | c815c2d33c28f0d10112d8239fcf6fe5d6b250ef /gRPC.podspec | |
| parent | d9c58961f91d877e760008e2916527b0d56b8826 (diff) | |
| parent | a709afe241d8b264a1c326315f757b4a8d330207 (diff) | |
Merge branch 'master' of github.com:grpc/grpc into merge
Diffstat (limited to 'gRPC.podspec')
| -rw-r--r-- | gRPC.podspec | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/gRPC.podspec b/gRPC.podspec index 785f2e1705..41dcdcd9ac 100644 --- a/gRPC.podspec +++ b/gRPC.podspec @@ -299,6 +299,7 @@ Pod::Spec.new do |s| 'src/core/ext/client_config/subchannel_call_holder.h', 'src/core/ext/client_config/subchannel_index.h', 'src/core/ext/client_config/uri_parser.h', + 'third_party/objective_c/Cronet/cronet_c_for_grpc.h', 'src/core/ext/lb_policy/grpclb/load_balancer_api.h', 'src/core/ext/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.h', 'third_party/nanopb/pb.h', @@ -337,6 +338,7 @@ Pod::Spec.new do |s| 'include/grpc/impl/codegen/sync_posix.h', 'include/grpc/impl/codegen/sync_win32.h', 'include/grpc/impl/codegen/time.h', + 'include/grpc/grpc_cronet.h', 'include/grpc/grpc_security.h', 'include/grpc/grpc_security_constants.h', 'include/grpc/census.h', @@ -496,6 +498,9 @@ Pod::Spec.new do |s| 'src/core/ext/client_config/uri_parser.c', 'src/core/ext/transport/chttp2/server/insecure/server_chttp2.c', 'src/core/ext/transport/chttp2/client/insecure/channel_create.c', + 'src/core/ext/transport/cronet/client/secure/cronet_channel_create.c', + 'src/core/ext/transport/cronet/transport/cronet_api_dummy.c', + 'src/core/ext/transport/cronet/transport/cronet_transport.c', 'src/core/ext/lb_policy/grpclb/load_balancer_api.c', 'src/core/ext/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.c', 'third_party/nanopb/pb_common.c', @@ -663,6 +668,7 @@ Pod::Spec.new do |s| 'src/core/ext/client_config/subchannel_call_holder.h', 'src/core/ext/client_config/subchannel_index.h', 'src/core/ext/client_config/uri_parser.h', + 'third_party/objective_c/Cronet/cronet_c_for_grpc.h', 'src/core/ext/lb_policy/grpclb/load_balancer_api.h', 'src/core/ext/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.h', 'third_party/nanopb/pb.h', |