diff options
| author |  Muxi Yan <muxi@users.noreply.github.com> | 2017-04-18 13:32:32 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2017-04-18 13:32:32 -0700 |
| commit | c2d9f1e297b7a504412be85ec9840e59bfdb794e (patch) | |
| tree | b07418b917d9143bc2de1fb81e6ae71e8be7b46c | |
| parent | 6b4435ccbcd12e29cd318389126457f7bc7bdcab (diff) | |
| parent | d28078869a0b0890aa1532f5ff85f1127286abcd (diff) | |
Merge pull request #10689 from muxi/revert-boringssl-81
Revert a change in BoringSSL 8.1 podspec
| -rw-r--r-- | src/objective-c/BoringSSL.podspec | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/objective-c/BoringSSL.podspec b/src/objective-c/BoringSSL.podspec index 7880aad10b..651bd4977d 100644 --- a/src/objective-c/BoringSSL.podspec +++ b/src/objective-c/BoringSSL.podspec @@ -31,7 +31,7 @@ Pod::Spec.new do |s| s.name = 'BoringSSL' - version = '8.1' + version = '8.2' s.version = version s.summary = 'BoringSSL is a fork of OpenSSL that is designed to meet Google’s needs.' # Adapted from the homepage: @@ -113,7 +113,6 @@ Pod::Spec.new do |s| s.subspec 'Interface' do |ss| ss.header_mappings_dir = 'include/openssl' ss.source_files = 'include/openssl/*.h' - ss.exclude_files = 'include/openssl/arm_arch.h' end s.subspec 'Implementation' do |ss| ss.header_mappings_dir = '.' @@ -150,6 +149,11 @@ Pod::Spec.new do |s| #include "ssl.h" #include "crypto.h" #include "aes.h" + /* The following macros are defined by base.h. The latter is the first file included by the + other headers. */ + #if defined(OPENSSL_ARM) || defined(OPENSSL_AARCH64) + # include "arm_arch.h" + #endif #include "asn1.h" #include "asn1_mac.h" #include "asn1t.h" |