One more patch to fix boringssl podspec

longdal · Jan 18, 2020 · 6e8899c · 6e8899c
1 parent 7951f7a
commit 6e8899c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/objective-c/BoringSSL-GRPC.podspec b/src/objective-c/BoringSSL-GRPC.podspec
@@ -97,7 +97,7 @@ Pod::Spec.new do |s|
   # the `Headers/` directory of the framework (i.e., not under `Headers/include/openssl`).
   #
   # TODO(jcanizales): Debug why this doesn't work on macOS.
-  s.header_mappings_dir = 'include/openssl'
+  s.header_mappings_dir = 'src/include/openssl'
 
   # The above has an undesired effect when creating a static library: It forces users to write
   # includes like `#include <BoringSSL/ssl.h>`. `s.header_dir` adds a path prefix to that, and
@@ -108,7 +108,7 @@ Pod::Spec.new do |s|
   # The module map and umbrella header created automatically by Cocoapods don't work for C libraries
   # like this one. The following file, and a correct umbrella header, are created on the fly by the
   # `prepare_command` of this pod.
-  s.module_map = 'include/openssl/BoringSSL.modulemap'
+  s.module_map = 'src/include/openssl/BoringSSL.modulemap'
 
   # We don't need to inhibit all warnings; only -Wno-shorten-64-to-32. But Cocoapods' linter doesn't
   # want that for some reason.

diff --git a/templates/src/objective-c/BoringSSL-GRPC.podspec.template b/templates/src/objective-c/BoringSSL-GRPC.podspec.template
@@ -104,7 +104,7 @@
     # the `Headers/` directory of the framework (i.e., not under `Headers/include/openssl`).
     #
     # TODO(jcanizales): Debug why this doesn't work on macOS.
-    s.header_mappings_dir = 'include/openssl'
+    s.header_mappings_dir = 'src/include/openssl'
 
     # The above has an undesired effect when creating a static library: It forces users to write
     # includes like `#include <BoringSSL/ssl.h>`. `s.header_dir` adds a path prefix to that, and
@@ -115,7 +115,7 @@
     # The module map and umbrella header created automatically by Cocoapods don't work for C libraries
     # like this one. The following file, and a correct umbrella header, are created on the fly by the
     # `prepare_command` of this pod.
-    s.module_map = 'include/openssl/BoringSSL.modulemap'
+    s.module_map = 'src/include/openssl/BoringSSL.modulemap'
 
     # We don't need to inhibit all warnings; only -Wno-shorten-64-to-32. But Cocoapods' linter doesn't
     # want that for some reason.