From 83e679fad1ccb6b4e3ddcb768e4d6c4f44dd8420 Mon Sep 17 00:00:00 2001 From: yulin-liang Date: Tue, 16 Jun 2020 11:16:28 -0700 Subject: [PATCH] Objc update WKT generated import paths. --- src/compiler/objective_c_plugin.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/compiler/objective_c_plugin.cc b/src/compiler/objective_c_plugin.cc index 2738a733d1f1b..5a5fa0e408257 100644 --- a/src/compiler/objective_c_plugin.cc +++ b/src/compiler/objective_c_plugin.cc @@ -52,15 +52,16 @@ inline ::grpc::string ImportProtoHeaders( ::grpc::string base_name = header; grpc_generator::StripPrefix(&base_name, "google/protobuf/"); + ::grpc::string file_name = "GPB" + base_name; // create the import code snippet ::grpc::string framework_header = - ::grpc::string(ProtobufLibraryFrameworkName) + "/" + base_name; + ::grpc::string(ProtobufLibraryFrameworkName) + "/" + file_name; static const ::grpc::string kFrameworkImportsCondition = "GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS"; return PreprocIfElse(kFrameworkImportsCondition, indent + SystemImport(framework_header), - indent + LocalImport(header)); + indent + LocalImport(file_name)); } } // namespace