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 /src | |
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 'src')
-rw-r--r-- | src/objective-c/BoringSSL-GRPC.podspec | 5 | ||||
-rw-r--r-- | src/objective-c/tests/CronetUnitTests/CronetUnitTests.m | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/objective-c/BoringSSL-GRPC.podspec b/src/objective-c/BoringSSL-GRPC.podspec index 704b35a29e..04e4d5768f 100644 --- a/src/objective-c/BoringSSL-GRPC.podspec +++ b/src/objective-c/BoringSSL-GRPC.podspec @@ -38,7 +38,7 @@ Pod::Spec.new do |s| s.name = 'BoringSSL-GRPC' - version = '0.0.1' + version = '0.0.2' s.version = version s.summary = 'BoringSSL is a fork of OpenSSL that is designed to meet Google\'s needs.' # Adapted from the homepage: @@ -81,7 +81,7 @@ Pod::Spec.new do |s| s.ios.deployment_target = '5.0' s.osx.deployment_target = '10.7' - name = 'openssl' + name = 'openssl_grpc' # When creating a dynamic framework, name it openssl.framework instead of BoringSSL.framework. # This lets users write their includes like `#include <openssl/ssl.h>` as opposed to `#include @@ -1546,6 +1546,7 @@ Pod::Spec.new do |s| sed -i'.back' '/^#define \\([A-Za-z0-9_]*\\) \\1/d' include/openssl/ssl.h sed -i'.back' 'N;/^#define \\([A-Za-z0-9_]*\\) *\\\\\\n *\\1/d' include/openssl/ssl.h sed -i'.back' 's/#ifndef md5_block_data_order/#ifndef GRPC_SHADOW_md5_block_data_order/g' crypto/fipsmodule/md5/md5.c + find . -type f \\( -path '*.h' -or -path '*.cc' -or -path '*.c' \\) -print0 | xargs -0 -L1 sed -E -i'.grpc_back' 's;#include <openssl/;#include <openssl_grpc/;g' END_OF_COMMAND # Redefine symbols to avoid conflict when the same app also depends on OpenSSL. The list of diff --git a/src/objective-c/tests/CronetUnitTests/CronetUnitTests.m b/src/objective-c/tests/CronetUnitTests/CronetUnitTests.m index 75a669da4d..84893b92c1 100644 --- a/src/objective-c/tests/CronetUnitTests/CronetUnitTests.m +++ b/src/objective-c/tests/CronetUnitTests/CronetUnitTests.m @@ -39,7 +39,7 @@ #import "src/core/tsi/grpc_shadow_boringssl.h" -#import <openssl/ssl.h> +#import <openssl_grpc/ssl.h> static void drain_cq(grpc_completion_queue *cq) { grpc_event ev; |