gn: Escape include path strings for shell

tools/gn/ninja_binary_target_writer.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "tools/gn/ninja_binary_target_writer.h"
 
 #include <set>
+#include <sstream>
 
 #include "base/strings/string_util.h"
 #include "tools/gn/config_values_extractors.h"
 #include "tools/gn/deps_iterator.h"
 #include "tools/gn/err.h"
 #include "tools/gn/escape.h"
 #include "tools/gn/ninja_utils.h"
 #include "tools/gn/settings.h"
 #include "tools/gn/string_utils.h"
 #include "tools/gn/substitution_writer.h"
@@ skipping 27 matching lines @@
   EscapeOptions options;
 };
 
 struct IncludeWriter {
   IncludeWriter(PathOutput& path_output) : path_output_(path_output) {
   }
   ~IncludeWriter() {
   }
 
   void operator()(const SourceDir& d, std::ostream& out) const {
-    out << " -I";
-    path_output_.WriteDir(out, d, PathOutput::DIR_NO_LAST_SLASH);
+    std::ostringstream path_out;
+    path_output_.WriteDir(path_out, d, PathOutput::DIR_NO_LAST_SLASH);
+    const std::string& path = path_out.str();
+    if (path[0] == '"')
+      out << " \"-I" << path.substr(1);
+    else
+      out << " -I" << path;
   }
 
   PathOutput& path_output_;
 };
 
 }  // namespace
 
 NinjaBinaryTargetWriter::NinjaBinaryTargetWriter(const Target* target,
                                                  std::ostream& out)
     : NinjaTargetWriter(target, out),
@@ skipping 22 matching lines @@
   if (subst.used[SUBSTITUTION_DEFINES]) {
     out_ << kSubstitutionNinjaNames[SUBSTITUTION_DEFINES] << " =";
     RecursiveTargetConfigToStream<std::string>(
         target_, &ConfigValues::defines, DefineWriter(), out_);
     out_ << std::endl;
   }
 
   // Include directories.
   if (subst.used[SUBSTITUTION_INCLUDE_DIRS]) {
     out_ << kSubstitutionNinjaNames[SUBSTITUTION_INCLUDE_DIRS] << " =";
+    PathOutput include_path_output(path_output_.current_dir(),
+                                   ESCAPE_NINJA_COMMAND);
     RecursiveTargetConfigToStream<SourceDir>(
         target_, &ConfigValues::include_dirs,
-        IncludeWriter(path_output_), out_);
+        IncludeWriter(include_path_output), out_);
     out_ << std::endl;
   }
 
   // C flags and friends.
   EscapeOptions flag_escape_options = GetFlagOptions();
 #define WRITE_FLAGS(name, subst_enum) \
     if (subst.used[subst_enum]) { \
       out_ << kSubstitutionNinjaNames[subst_enum] << " ="; \
       RecursiveTargetConfigStringsToStream(target_, &ConfigValues::name, \
                                            flag_escape_options, out_); \
@@ skipping 357 matching lines @@
     return false;  // No tool for this file (it's a header file or something).
   const Tool* tool = target->toolchain()->GetTool(*computed_tool_type);
   if (!tool)
     return false;  // Tool does not apply for this toolchain.file.
 
   // Figure out what output(s) this compiler produces.
   SubstitutionWriter::ApplyListToCompilerAsOutputFile(
       target, source, tool->outputs(), outputs);
   return !outputs->empty();
 }