From 9291e5d4da5721a28ad912d2994e0381ebf15e97 Mon Sep 17 00:00:00 2001 From: Muxi Yan Date: Tue, 12 Jun 2018 16:22:35 -0700 Subject: [PATCH] Update ObjC build hack --- gRPC-Core.podspec | 3 ++- templates/gRPC-Core.podspec.template | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/gRPC-Core.podspec b/gRPC-Core.podspec index a4d62a76c66..dbebd4ca704 100644 --- a/gRPC-Core.podspec +++ b/gRPC-Core.podspec @@ -1264,6 +1264,7 @@ Pod::Spec.new do |s| # 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 ! -path '*.back*' -exec sed -E -i'.back' 's;#include "third_party/nanopb/(.*)";#include ;g' {} \\\; + find src/core/ -type f ! -path '*.grpc_back' -exec sed -E -i'.grpc_back' 's;#include "(pb(_.*)?\\.h)";#include ;g' {} \\\; + find src/core/ -type f -path '*.grpc_back' | xargs rm END_OF_COMMAND end diff --git a/templates/gRPC-Core.podspec.template b/templates/gRPC-Core.podspec.template index a767a612a61..237389b7f4e 100644 --- a/templates/gRPC-Core.podspec.template +++ b/templates/gRPC-Core.podspec.template @@ -220,6 +220,7 @@ # 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 ! -path '*.back*' -exec sed -E -i'.back' 's;#include "third_party/nanopb/(.*)";#include ;g' {} \\\; + find src/core/ -type f ! -path '*.grpc_back' -exec sed -E -i'.grpc_back' 's;#include "(pb(_.*)?\\.h)";#include ;g' {} \\\; + find src/core/ -type f -path '*.grpc_back' | xargs rm END_OF_COMMAND end