GN: don't write separate files for non-binary targets

tools/gn/ninja_toolchain_writer.h

Index: tools/gn/ninja_toolchain_writer.h
diff --git a/tools/gn/ninja_toolchain_writer.h b/tools/gn/ninja_toolchain_writer.h
index a1e39c3c52edb28869a696cd08703a69bacedd38..9ddde849d700bcdb7035e81b1748c65d85429910 100644
--- a/tools/gn/ninja_toolchain_writer.h
+++ b/tools/gn/ninja_toolchain_writer.h
@@ -12,6 +12,7 @@
 
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
+#include "tools/gn/ninja_writer.h"
 #include "tools/gn/path_output.h"
 #include "tools/gn/toolchain.h"
 
@@ -25,20 +26,20 @@ class NinjaToolchainWriter {
  public:
   // Takes the settings for the toolchain, as well as the list of all targets
   // associated with the toolchain.
-  static bool RunAndWriteFile(const Settings* settings,
-                              const Toolchain* toolchain,
-                              const std::vector<const Target*>& targets);
+  static bool RunAndWriteFile(
+      const Settings* settings,
+      const Toolchain* toolchain,
+      const std::vector<NinjaWriter::TargetRulePair>& rules);
 
  private:
   FRIEND_TEST_ALL_PREFIXES(NinjaToolchainWriter, WriteToolRule);
 
   NinjaToolchainWriter(const Settings* settings,
                        const Toolchain* toolchain,
-                       const std::vector<const Target*>& targets,
                        std::ostream& out);
   ~NinjaToolchainWriter();
 
-  void Run();
+  void Run(const std::vector<NinjaWriter::TargetRulePair>& extra_rules);
 
   void WriteRules();
   void WriteToolRule(Toolchain::ToolType type,
@@ -47,11 +48,9 @@ class NinjaToolchainWriter {
   void WriteRulePattern(const char* name,
                         const SubstitutionPattern& pattern,
                         const EscapeOptions& options);
-  void WriteSubninjas();
 
   const Settings* settings_;
   const Toolchain* toolchain_;
-  std::vector<const Target*> targets_;
   std::ostream& out_;
   PathOutput path_output_;