DO NOT SUBMIT. Experimental Mac GN Framework support.

tools/gn/target.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/target.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 
@@ skipping 333 matching lines @@
 }
 
 std::string Target::GetComputedOutputName(bool include_prefix) const {
   DCHECK(toolchain_)
       << "Toolchain must be specified before getting the computed output name.";
 
   const std::string& name = output_name_.empty() ? label().name()
                                                  : output_name_;
 
   std::string result;
+  FindDir(&name).AppendToString(&result);
+  base::StringPiece basename = FindFilename(&name);
   if (include_prefix) {
     const Tool* tool = toolchain_->GetToolForTargetFinalOutput(this);
     if (tool) {
       // Only add the prefix if the name doesn't already have it.
-      if (!base::StartsWith(name, tool->output_prefix(),
-                            base::CompareCase::SENSITIVE))
-        result = tool->output_prefix();
+      if (!base::StartsWith(basename, tool->output_prefix(),
+                            base::CompareCase::SENSITIVE)) {
+        result.append(tool->output_prefix());
+      }
     }
   }
-  result.append(name);
+  basename.AppendToString(&result);
   return result;
 }
 
 bool Target::SetToolchain(const Toolchain* toolchain, Err* err) {
   DCHECK(!toolchain_);
   DCHECK_NE(UNKNOWN, output_type_);
   toolchain_ = toolchain;
 
   const Tool* tool = toolchain->GetToolForTargetFinalOutput(this);
   if (tool)
@@ skipping 381 matching lines @@
   if (!EnsureFileIsGeneratedByDependency(this, out_file, true, false,
                                          &seen_targets)) {
     // Check object files (much slower and very rare) only if the "normal"
     // output check failed.
     seen_targets.clear();
     if (!EnsureFileIsGeneratedByDependency(this, out_file, true, true,
                                            &seen_targets))
       g_scheduler->AddUnknownGeneratedInput(this, source);
   }
 }