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

tools/gn/ninja_helper.cc

Index: tools/gn/ninja_helper.cc
diff --git a/tools/gn/ninja_helper.cc b/tools/gn/ninja_helper.cc
index cc03dd566703f0f010be2c0056c7305b23c1b43b..956e74c276b3d5db021e242de2b795d3c558b577 100644
--- a/tools/gn/ninja_helper.cc
+++ b/tools/gn/ninja_helper.cc
@@ -12,7 +12,6 @@
 
 namespace {
 
-const char kLibDirWithSlash[] = "lib/";
 const char kObjectDirNoSlash[] = "obj";
 
 }  // namespace
@@ -178,10 +177,9 @@ OutputFile NinjaHelper::GetTargetOutputFile(const Target* target) const {
   // 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);
@@ -192,19 +190,6 @@ OutputFile NinjaHelper::GetTargetOutputFile(const Target* target) const {
     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);