GN: Put shared libraries in outdir, not outdir/lib

tools/gn/ninja_helper.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_helper.h"
 
 #include "base/logging.h"
 #include "base/strings/string_util.h"
 #include "tools/gn/filesystem_utils.h"
 #include "tools/gn/string_utils.h"
 #include "tools/gn/target.h"
 
 namespace {
 
-const char kLibDirWithSlash[] = "lib/";
 const char kObjectDirNoSlash[] = "obj";
 
 }  // namespace
 
 NinjaHelper::NinjaHelper(const BuildSettings* build_settings)
     : build_settings_(build_settings) {
   build_to_src_no_last_slash_ = build_settings->build_to_source_dir_string();
   if (!build_to_src_no_last_slash_.empty() &&
       build_to_src_no_last_slash_[build_to_src_no_last_slash_.size() - 1] ==
           '/')
@@ skipping 145 matching lines @@
                                             target->settings()->target_os());
     }
   } else {
     extension = target->output_extension().c_str();
   }
 
   // Everything goes into the toolchain directory (which will be empty for the
   // default toolchain, and will end in a slash otherwise).
   ret.value().append(target->settings()->toolchain_output_subdir().value());
 
-  // Binaries and loadable libraries go into the toolchain root.
+  // Binaries and shared libraries go into the toolchain root.
   if (target->output_type() == Target::EXECUTABLE ||
-      ((target->settings()->IsMac() || target->settings()->IsWin()) &&
-       target->output_type() == Target::SHARED_LIBRARY)) {
+      target->output_type() == Target::SHARED_LIBRARY) {
     // Generate a name like "<toolchain>/<prefix><name>.<extension>".
     ret.value().append(prefix);
     ret.value().append(name);
     if (extension[0]) {
       ret.value().push_back('.');
       ret.value().append(extension);
     }
     return ret;
   }
 
-  // Libraries go into the library subdirectory like
-  // "<toolchain>/lib/<prefix><name>.<extension>".
-  if (target->output_type() == Target::SHARED_LIBRARY) {
-    ret.value().append(kLibDirWithSlash);
-    ret.value().append(prefix);
-    ret.value().append(name);
-    if (extension[0]) {
-      ret.value().push_back('.');
-      ret.value().append(extension);
-    }
-    return ret;
-  }
-
   // Everything else goes next to the target's .ninja file like
   // "<toolchain>/obj/<path>/<name>.<extension>".
   ret.value().append(kObjectDirNoSlash);
   AppendStringPiece(&ret.value(),
                     target->label().dir().SourceAbsoluteWithOneSlash());
   ret.value().append(prefix);
   ret.value().append(name);
   if (extension[0]) {
     ret.value().push_back('.');
     ret.value().append(extension);
@@ skipping 28 matching lines @@
     return prefix + "rc";
   if (type == SOURCE_S)
     return prefix + "cc";  // Assembly files just get compiled by CC.
 
   // TODO(brettw) asm files.
 
   // .obj files have no rules to make them (they're already built) so we return
   // the enpty string for SOURCE_O.
   return std::string();
 }