|
|
|
@ -142,8 +142,6 @@ Pod::Spec.new do |s| |
|
|
|
|
'crypto/*.h', |
|
|
|
|
'crypto/**/*.h', |
|
|
|
|
'third_party/fiat/*.h' |
|
|
|
|
# bcm.c includes other source files, creating duplicated symbols. Since it is not used, we |
|
|
|
|
# explicitly exclude it from the pod. |
|
|
|
|
# TODO (mxyan): Work with BoringSSL team to remove this hack. |
|
|
|
|
ss.exclude_files = '**/*_test.*', |
|
|
|
|
'**/test_*.*', |
|
|
|
@ -1621,11 +1619,12 @@ Pod::Spec.new do |s| |
|
|
|
|
|
|
|
|
|
EOF |
|
|
|
|
|
|
|
|
|
# The symbol prefixing mechanism is performed by redefining BoringSSL symbols with |
|
|
|
|
# "#define SOME_BORINGSSL_SYMBOL GRPC_SHADOW_SOME_BORINGSSL_SYMBOL". Unfortunately, some symbols are already |
|
|
|
|
# redefined as macros in BoringSSL headers in the form "#define SOME_BORINGSSL_SYMBOL SOME_BORINGSSL_SYMBOL" |
|
|
|
|
# Such type of redefinition will cause "duplicate symbols" when using together with our prefix header. So |
|
|
|
|
# the workaround in the below lines removes all such type of #define directives. |
|
|
|
|
# The symbol prefixing mechanism is performed by redefining BoringSSL symbols with "#define |
|
|
|
|
# SOME_BORINGSSL_SYMBOL GRPC_SHADOW_SOME_BORINGSSL_SYMBOL". Unfortunately, some symbols are |
|
|
|
|
# already redefined as macros in BoringSSL headers in the form "#define SOME_BORINGSSL_SYMBOL |
|
|
|
|
# SOME_BORINGSSL_SYMBOL" Such type of redefinition will cause "SOME_BORINGSSL_SYMBOL redefined" |
|
|
|
|
# error when using together with our prefix header. So the workaround in the below lines removes |
|
|
|
|
# all such type of #define directives. |
|
|
|
|
sed -i'.back' '/^#define \\([A-Za-z0-9_]*\\) \\1/d' include/openssl/*.h |
|
|
|
|
# Remove lines of the format below for the same reason above |
|
|
|
|
# #define SOME_BORINGSSL_SYMBOL \ |
|
|
|
|