Revert "Let cronet use grpc_cronet_registry_plugin"
diff --git a/templates/gRPC-Core.podspec.template b/templates/gRPC-Core.podspec.template
index 33a8a8b..af97d81 100644
--- a/templates/gRPC-Core.podspec.template
+++ b/templates/gRPC-Core.podspec.template
@@ -42,21 +42,21 @@
out = grpc_lib_files(libs, ("grpc", "gpr"), ("headers",))
return [file for file in out if not file.startswith("third_party/nanopb/")]
- def grpc_cronet_private_files(libs):
- out = grpc_lib_files(libs, ("grpc_cronet", "gpr"), ("headers", "src"))
- excl = [
- # We do not want dummy cronet API for ObjC
+ def grpc_cronet_files(libs):
+ out = grpc_lib_files(libs, ("grpc_cronet",), ("src", "headers"))
+ excl = grpc_private_files(libs)
+ excl += [
+ # We do not need cronet dedicated plugin registry
+ "src/core/plugin_registry/grpc_cronet_plugin_registry.cc",
+ # We do not need dummy cronet API for ObjC
"src/core/ext/transport/cronet/transport/cronet_api_dummy.cc",
]
return [file for file in out if not file in excl]
def grpc_cronet_public_headers(libs):
- out = grpc_lib_files(libs, ("grpc_cronet", "gpr"), ("public_headers",))
- return out
-
- def grpc_cronet_private_headers(libs):
- out = grpc_lib_files(libs, ("grpc_cronet", "gpr"), ("headers",))
- return out
+ out = grpc_lib_files(libs, ("grpc_cronet",), ("public_headers",))
+ excl = grpc_public_headers(libs)
+ return [file for file in out if not file in excl]
def grpc_test_util_files(libs):
out = grpc_lib_files(libs, ("grpc_test_util", "gpr_test_util"), ("src", "headers"))
@@ -169,6 +169,7 @@
ss.dependency 'BoringSSL', '~> 10.0'
ss.dependency 'nanopb', '~> 0.3'
+ # To save you from scrolling, this is the last part of the podspec.
ss.source_files = ${ruby_multiline_list(grpc_private_files(libs), 22)}
ss.private_header_files = ${ruby_multiline_list(grpc_private_headers(libs), 30)}
@@ -181,21 +182,19 @@
s.subspec 'Cronet-Implementation' do |ss|
ss.header_mappings_dir = '.'
- ss.libraries = 'z'
+
+ ss.dependency "#{s.name}/Interface", version
+ ss.dependency "#{s.name}/Implementation", version
ss.dependency "#{s.name}/Cronet-Interface", version
- ss.dependency 'BoringSSL', '~> 10.0'
- ss.dependency 'nanopb', '~> 0.3'
- ss.source_files = ${ruby_multiline_list(grpc_cronet_private_files(libs), 22)}
-
- ss.private_header_files = ${ruby_multiline_list(grpc_cronet_private_headers(libs), 30)}
+ ss.source_files = ${ruby_multiline_list(grpc_cronet_files(libs), 22)}
end
- s.subspec 'Cronet-Tests' do |ss|
+ s.subspec 'Tests' do |ss|
ss.header_mappings_dir = '.'
- ss.dependency "#{s.name}/Cronet-Interface", version
- ss.dependency "#{s.name}/Cronet-Implementation", version
+ ss.dependency "#{s.name}/Interface", version
+ ss.dependency "#{s.name}/Implementation", version
ss.source_files = ${ruby_multiline_list(grpc_test_util_files(libs), 22)},
${ruby_multiline_list(end2end_tests_files(libs), 22)}