GN: Put static libs next to .ninja files in output dir

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 75843ee453634be3d9c97fa9f8fcf8855d27b26a..cc03dd566703f0f010be2c0056c7305b23c1b43b 100644
--- a/tools/gn/ninja_helper.cc
+++ b/tools/gn/ninja_helper.cc
@@ -180,10 +180,7 @@ OutputFile NinjaHelper::GetTargetOutputFile(const Target* target) const {
 
   // Binaries and loadable libraries go into the toolchain root.
   if (target->output_type() == Target::EXECUTABLE ||
-      (target->settings()->IsMac() &&
-          (target->output_type() == Target::SHARED_LIBRARY ||
-           target->output_type() == Target::STATIC_LIBRARY)) ||
-      (target->settings()->IsWin() &&
+      ((target->settings()->IsMac() || target->settings()->IsWin()) &&
        target->output_type() == Target::SHARED_LIBRARY)) {
     // Generate a name like "<toolchain>/<prefix><name>.<extension>".
     ret.value().append(prefix);