Don't generate imports for the WKTs unless generating the WKTs.

Since the generated header import GPBProtocolBuffers.h, there is no need
to generate imports for the WKTs as they will have already been imported.

1 files changed, 3 insertions, 1 deletions

diff --git a/src/google/protobuf/compiler/objectivec/objectivec_helpers.h b/src/google/protobuf/compiler/objectivec/objectivec_helpers.h
index f74607c8..8999aa59 100644
--- a/src/google/protobuf/compiler/objectivec/objectivec_helpers.h
+++ b/src/google/protobuf/compiler/objectivec/objectivec_helpers.h
@@ -253,7 +253,8 @@ bool LIBPROTOC_EXPORT ParseSimpleFile(
 class LIBPROTOC_EXPORT ImportWriter {
  public:
   ImportWriter(const string& generate_for_named_framework,
-               const string& named_framework_to_proto_path_mappings_path);
+               const string& named_framework_to_proto_path_mappings_path,
+               bool include_wkt_imports);
   ~ImportWriter();
 
   void AddFile(const FileDescriptor* file, const string& header_extension);
@@ -275,6 +276,7 @@ class LIBPROTOC_EXPORT ImportWriter {
 
   const string generate_for_named_framework_;
   const string named_framework_to_proto_path_mappings_path_;
+  const bool include_wkt_imports_;
   std::map<string, string> proto_file_to_framework_name_;
   bool need_to_parse_mapping_file_;