Skip to content

Commit

Permalink
Merge pull request grpc#7368 from muxi/cronet-e2e
Browse files Browse the repository at this point in the history
Establish Objective C end-to-end core test with Cronet
  • Loading branch information
makdharma authored Jul 21, 2016
2 parents e1951a1 + 4c82af5 commit 76692bb
Show file tree
Hide file tree
Showing 7 changed files with 742 additions and 4 deletions.
25 changes: 24 additions & 1 deletion gRPC-Core.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,8 @@ Pod::Spec.new do |s|
'ALWAYS_SEARCH_USER_PATHS' => 'NO',
}

s.default_subspecs = 'Interface', 'Implementation'

# Like many other C libraries, gRPC-Core has its public headers under `include/<libname>/` and its
# sources and private headers in other directories outside `include/`. Cocoapods' linter doesn't
# allow any header to be listed outside the `header_mappings_dir` (even though doing so works in
Expand Down Expand Up @@ -193,7 +195,6 @@ Pod::Spec.new do |s|
ss.dependency "#{s.name}/Interface", version
ss.dependency 'BoringSSL', '~> 4.0'

# To save you from scrolling, this is the last part of the podspec.
ss.source_files = 'src/core/lib/profiling/timers.h',
'src/core/lib/support/backoff.h',
'src/core/lib/support/block_annotate.h',
Expand Down Expand Up @@ -759,4 +760,26 @@ Pod::Spec.new do |s|
'src/core/ext/census/mlog.h',
'src/core/ext/census/rpc_metric_id.h'
end

s.subspec 'Cronet-Interface' do |ss|
ss.header_mappings_dir = 'include/grpc'
ss.source_files = 'include/grpc/grpc_cronet.h'
end

s.subspec 'Cronet-Tests' do |ss|
ss.header_mappings_dir = '.'

ss.source_files = 'src/core/ext/transport/cronet/client/secure/cronet_channel_create.c',
'src/core/ext/transport/cronet/transport/cronet_transport.c',
'test/core/end2end/cq_verifier.{c,h}',
'test/core/end2end/end2end_tests.{c,h}',
'test/core/end2end/tests/*.{c,h}',
'test/core/end2end/data/*.{c,h}',
'test/core/util/test_config.{c,h}',
'test/core/util/port.h',
'test/core/util/port_posix.c',
'test/core/util/port_server_client.{c,h}'

ss.dependency 'CronetFramework'
end
end
Loading

0 comments on commit 76692bb

Please sign in to comment.