diff options
| author |  Muxi Yan <muxi@users.noreply.github.com> | 2018-09-21 16:05:32 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-09-21 16:05:32 -0700 |
| commit | a6d8972a07a70e359b0e7c543a0fea8256af549c (patch) | |
| tree | 7979318d0ba3a4e0e6e4ea417793230ba6c3d1e1 /gRPC-Core.podspec | |
| parent | 12f42765cf3ea707a8adf94e56160cc9f069677b (diff) | |
| parent | 0049ba865d4a2d61aff3975ff9778d21d4203bd2 (diff) | |
Merge pull request #16660 from muxi/rename-boringssl-grpc
Rename the BoringSSL framework to openssl_grpc to avoid conflict with OpenSSL
Diffstat (limited to 'gRPC-Core.podspec')
| -rw-r--r-- | gRPC-Core.podspec | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/gRPC-Core.podspec b/gRPC-Core.podspec index 1efa71a19e..964039186c 100644 --- a/gRPC-Core.podspec +++ b/gRPC-Core.podspec @@ -181,7 +181,7 @@ Pod::Spec.new do |s| ss.header_mappings_dir = '.' ss.libraries = 'z' ss.dependency "#{s.name}/Interface", version - ss.dependency 'BoringSSL-GRPC', '0.0.1' + ss.dependency 'BoringSSL-GRPC', '0.0.2' ss.dependency 'nanopb', '~> 0.3' ss.compiler_flags = '-DGRPC_SHADOW_BORINGSSL_SYMBOLS' @@ -1310,5 +1310,6 @@ Pod::Spec.new do |s| s.prepare_command = <<-END_OF_COMMAND find src/core/ -type f ! -path '*.grpc_back' -print0 | xargs -0 -L1 sed -E -i'.grpc_back' 's;#include "(pb(_.*)?\\.h)";#include <nanopb/\\1>;g' find src/core/ -type f -path '*.grpc_back' -print0 | xargs -0 rm + find src/core/ -type f \\( -path '*.h' -or -path '*.cc' \\) -print0 | xargs -0 -L1 sed -E -i'.grpc_back' 's;#include <openssl/;#include <openssl_grpc/;g' END_OF_COMMAND end |