Merge pull request #11714 from muxi/port-11712

Port #11712: Fix the nanopb's header include issue
7 years ago · e60c0f82b5
parent 30b4e74296 43c4710a80
commit e60c0f82b5
2 changed files with 10 additions and 0 deletions
--- a/gRPC-Core.podspec
+++ b/gRPC-Core.podspec
@ -994,4 +994,9 @@ Pod::Spec.new do |s|
                      'test/core/util/port.c',
                      'test/core/util/port_server_client.{c,h}'
  end
+
+  # TODO (mxyan): Instead of this hack, add include path "third_party" to C core's include path?
+  s.prepare_command = <<-END_OF_COMMAND
+    find src/core/ -type f -exec sed -E -i '.back' 's;#include "third_party/nanopb/(.*)";#include <nanopb/\\1>;g' {} \\\;
+  END_OF_COMMAND
 end
--- a/templates/gRPC-Core.podspec.template
+++ b/templates/gRPC-Core.podspec.template
@ -178,4 +178,9 @@
                        'test/core/util/port.c',
                        'test/core/util/port_server_client.{c,h}'
    end
+
+    # TODO (mxyan): Instead of this hack, add include path "third_party" to C core's include path?
+    s.prepare_command = <<-END_OF_COMMAND
+      find src/core/ -type f -exec sed -E -i '.back' 's;#include "third_party/nanopb/(.*)";#include <nanopb/\\1>;g' {} \\\;
+    END_OF_COMMAND
  end