Special-case paths that appear in libs by not prefixing them with -l.

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 <cstring>
 #include <set>
 #include <sstream>
 
@@ skipping 734 matching lines @@
 
   UniqueVector<OutputFile> extra_object_files;
   UniqueVector<const Target*> linkable_deps;
   UniqueVector<const Target*> non_linkable_deps;
   GetDeps(&extra_object_files, &linkable_deps, &non_linkable_deps);
 
   // Object files.
   path_output_.WriteFiles(out_, object_files);
   path_output_.WriteFiles(out_, extra_object_files);
 
+  // Libraries specified by paths.

[brettw, 2015/12/18 00:04:55]

We should get a test for this new behavior.

[agrieve, 2015/12/18 15:39:07]

Done.

+  const OrderedSet<LibFile>& libs = target_->all_libs();
+  for (size_t i = 0; i < libs.size(); i++) {
+    if (libs[i].is_source_file()) {

[brettw, 2015/12/18 00:04:55]

No {} for single-line ones (file style).

[agrieve, 2015/12/18 15:39:07]

Done.

+      path_output_.WriteFile(out_, libs[i].source_file());
+    }
+  }
+
   // Dependencies.
   std::vector<OutputFile> implicit_deps;
   std::vector<OutputFile> solibs;
   for (const Target* cur : linkable_deps) {
     // All linkable deps should have a link output file.
     DCHECK(!cur->link_output_file().value().empty())
         << "No link output file for "
         << target_->label().GetUserVisibleName(false);
 
     if (cur->dependency_output_file().value() !=
@@ skipping 85 matching lines @@
 
   out_ << std::endl;
 }
 
 void NinjaBinaryTargetWriter::WriteLibs() {
   out_ << "  libs =";
 
   // Libraries that have been recursively pushed through the dependency tree.
   EscapeOptions lib_escape_opts;
   lib_escape_opts.mode = ESCAPE_NINJA_COMMAND;
-  const OrderedSet<std::string> all_libs = target_->all_libs();
+  const OrderedSet<LibFile> all_libs = target_->all_libs();
   const std::string framework_ending(".framework");
   for (size_t i = 0; i < all_libs.size(); i++) {
-    if (base::EndsWith(all_libs[i], framework_ending,
-                       base::CompareCase::INSENSITIVE_ASCII)) {
+    const LibFile& lib_file = all_libs[i];
+    std::string value = lib_file.value();

[brettw, 2015/12/18 00:04:55]

Can this be a const ref? I think it would also be more clear to call this
lib_value or something.

[agrieve, 2015/12/18 15:39:08]

Done.

+    if (lib_file.is_source_file()) {
+      out_ << " ";
+      path_output_.WriteFile(out_, lib_file.source_file());
+    } else if (base::EndsWith(value, framework_ending,
+                              base::CompareCase::INSENSITIVE_ASCII)) {
       // Special-case libraries ending in ".framework" to support Mac: Add the
       // -framework switch and don't add the extension to the output.
       out_ << " -framework ";
-      EscapeStringToStream(out_,
-          all_libs[i].substr(0, all_libs[i].size() - framework_ending.size()),
+      EscapeStringToStream(
+          out_, value.substr(0, value.size() - framework_ending.size()),
           lib_escape_opts);
     } else {
       out_ << " " << tool_->lib_switch();
-      EscapeStringToStream(out_, all_libs[i], lib_escape_opts);
+      EscapeStringToStream(out_, value, lib_escape_opts);
     }
   }
   out_ << std::endl;
 }
 
 void NinjaBinaryTargetWriter::WriteOutputExtension() {
   out_ << "  output_extension = ";
   if (target_->output_extension().empty()) {
     // Use the default from the tool.
     out_ << tool_->default_output_extension();
@@ skipping 143 matching lines @@
           "\n"
           "In the latter case, either rename one of the files or move one of\n"
           "the sources to a separate source_set to avoid them both being in\n"
           "the same target.");
       g_scheduler->FailWithError(err);
       return false;
     }
   }
   return true;
 }