Skip to content
Snippets Groups Projects
Commit f8372c60 authored by Muxi Yan's avatar Muxi Yan
Browse files

Minor revisions

parent 2a5072e8
No related branches found
No related tags found
No related merge requests found
...@@ -770,13 +770,13 @@ Pod::Spec.new do |s| ...@@ -770,13 +770,13 @@ Pod::Spec.new do |s|
ss.source_files = 'include/grpc/grpc_cronet.h' ss.source_files = 'include/grpc/grpc_cronet.h'
end end
s.subspec 'Cronet-Implement' do |ss| s.subspec 'Cronet-Implementation' do |ss|
ss.header_mappings_dir = '.' ss.header_mappings_dir = '.'
ss.source_files = 'src/core/ext/transport/cronet/client/secure/cronet_channel_create.c', ss.source_files = 'src/core/ext/transport/cronet/client/secure/cronet_channel_create.c',
'src/core/ext/transport/cronet/transport/cronet_transport.c' 'src/core/ext/transport/cronet/transport/cronet_transport.c'
end end
s.subspec 'Cronet-Tests' do |ss| s.subspec 'Tests' do |ss|
ss.header_mappings_dir = '.' ss.header_mappings_dir = '.'
ss.source_files = 'test/core/end2end/cq_verifier.{c,h}', ss.source_files = 'test/core/end2end/cq_verifier.{c,h}',
......
...@@ -32,7 +32,7 @@ GRPC_LOCAL_SRC = '../../..' ...@@ -32,7 +32,7 @@ GRPC_LOCAL_SRC = '../../..'
if target_name == 'InteropTestsRemoteWithCronet' if target_name == 'InteropTestsRemoteWithCronet'
pod 'CronetFramework', :podspec => "#{GRPC_LOCAL_SRC}/src/objective-c" pod 'CronetFramework', :podspec => "#{GRPC_LOCAL_SRC}/src/objective-c"
pod 'gRPC-Core/Cronet-Implement', :path => GRPC_LOCAL_SRC pod 'gRPC-Core/Cronet-Implementation', :path => GRPC_LOCAL_SRC
end end
end end
end end
...@@ -42,8 +42,8 @@ target 'CoreCronetEnd2EndTests' do ...@@ -42,8 +42,8 @@ target 'CoreCronetEnd2EndTests' do
pod 'CronetFramework', :podspec => "#{GRPC_LOCAL_SRC}/src/objective-c" pod 'CronetFramework', :podspec => "#{GRPC_LOCAL_SRC}/src/objective-c"
pod 'gRPC-Core', :path => GRPC_LOCAL_SRC pod 'gRPC-Core', :path => GRPC_LOCAL_SRC
pod 'gRPC-Core/Cronet-Interface', :path => GRPC_LOCAL_SRC pod 'gRPC-Core/Cronet-Interface', :path => GRPC_LOCAL_SRC
pod 'gRPC-Core/Cronet-Implement', :path => GRPC_LOCAL_SRC pod 'gRPC-Core/Cronet-Implementation', :path => GRPC_LOCAL_SRC
pod 'gRPC-Core/Cronet-Tests', :path => GRPC_LOCAL_SRC pod 'gRPC-Core/Tests', :path => GRPC_LOCAL_SRC
end end
# gRPC-Core.podspec needs to be modified to be successfully used for local development. A Podfile's # gRPC-Core.podspec needs to be modified to be successfully used for local development. A Podfile's
...@@ -82,7 +82,7 @@ post_install do |installer| ...@@ -82,7 +82,7 @@ post_install do |installer|
target.build_configurations.each do |config| target.build_configurations.each do |config|
config.build_settings['GCC_TREAT_WARNINGS_AS_ERRORS'] = 'YES' config.build_settings['GCC_TREAT_WARNINGS_AS_ERRORS'] = 'YES'
end end
if target.name == 'gRPC-Core' or target.name == 'gRPC-Core.default-Cronet-Implement-Cronet-Interface-Cronet-Tests' or target.name == 'gRPC-Core.default-Cronet-Implement' if target.name == 'gRPC-Core' or target.name == 'gRPC-Core.default-Cronet-Implementation-Cronet-Interface-Tests' or target.name == 'gRPC-Core.default-Cronet-Implementation'
target.build_configurations.each do |config| target.build_configurations.each do |config|
# TODO(zyc): Remove this setting after the issue is resolved # TODO(zyc): Remove this setting after the issue is resolved
# GPR_UNREACHABLE_CODE causes "Control may reach end of non-void # GPR_UNREACHABLE_CODE causes "Control may reach end of non-void
......
...@@ -162,13 +162,13 @@ ...@@ -162,13 +162,13 @@
ss.source_files = 'include/grpc/grpc_cronet.h' ss.source_files = 'include/grpc/grpc_cronet.h'
end end
s.subspec 'Cronet-Implement' do |ss| s.subspec 'Cronet-Implementation' do |ss|
ss.header_mappings_dir = '.' ss.header_mappings_dir = '.'
ss.source_files = 'src/core/ext/transport/cronet/client/secure/cronet_channel_create.c', ss.source_files = 'src/core/ext/transport/cronet/client/secure/cronet_channel_create.c',
'src/core/ext/transport/cronet/transport/cronet_transport.c' 'src/core/ext/transport/cronet/transport/cronet_transport.c'
end end
s.subspec 'Cronet-Tests' do |ss| s.subspec 'Tests' do |ss|
ss.header_mappings_dir = '.' ss.header_mappings_dir = '.'
ss.source_files = 'test/core/end2end/cq_verifier.{c,h}', ss.source_files = 'test/core/end2end/cq_verifier.{c,h}',
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment