From cb2460611772548f38adfad42e5eae3c45a28e89 Mon Sep 17 00:00:00 2001 From: Hannah Shi Date: Fri, 22 Sep 2023 14:05:18 -0700 Subject: [PATCH] Revert "[ObjC] Remove grpc core podspec module map" (#34439) Reverts grpc/grpc#34361 Not sure why CI didn't capture it and why my previous test works, but looks like it broke at least src/objective-c/examples/SwiftSample build. Will see how CI goes in this PR. --- gRPC-Core.podspec | 3 +++ templates/gRPC-Core.podspec.template | 3 +++ 2 files changed, 6 insertions(+) diff --git a/gRPC-Core.podspec b/gRPC-Core.podspec index 801535f6614..167607b950a 100644 --- a/gRPC-Core.podspec +++ b/gRPC-Core.podspec @@ -65,6 +65,9 @@ Pod::Spec.new do |s| # following lets users write `#include `. s.header_dir = name + # The module map created automatically by Cocoapods doesn't work for C libraries like gRPC-Core. + s.module_map = 'include/grpc/module.modulemap' + # To compile the library, we need the user headers search path (quoted includes) to point to the # root of the repo, third_party/** and two upb generated directories, and the system headers # search path (angled includes) to point to `include/`. diff --git a/templates/gRPC-Core.podspec.template b/templates/gRPC-Core.podspec.template index 8e31c8a060c..6bdea60c521 100644 --- a/templates/gRPC-Core.podspec.template +++ b/templates/gRPC-Core.podspec.template @@ -141,6 +141,9 @@ # following lets users write `#include `. s.header_dir = name + # The module map created automatically by Cocoapods doesn't work for C libraries like gRPC-Core. + s.module_map = 'include/grpc/module.modulemap' + # To compile the library, we need the user headers search path (quoted includes) to point to the # root of the repo, third_party/** and two upb generated directories, and the system headers # search path (angled includes) to point to `include/`.