Fix generation of target in Xcode project when using output_name.

tools/gn/xcode_writer.cc

 // Copyright 2016 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/xcode_writer.h"
 
 #include <iomanip>
 #include <map>
 #include <memory>
 #include <sstream>
@@ skipping 171 matching lines @@
   std::vector<const Target*> targets;
   std::vector<const Target*> all_targets = builder->GetAllResolvedTargets();
   if (!XcodeWriter::FilterTargets(build_settings, all_targets,
                                   dir_filters_string, &targets, err)) {
     return false;
   }
 
   XcodeWriter workspace(workspace_name);
   workspace.CreateProductsProject(targets, attributes, source_path, config_name,
                                   root_target_name, ninja_extra_args,
-                                  target_os);
+                                  build_settings, target_os);
 
   workspace.CreateSourcesProject(all_targets, build_settings->build_dir(),
                                  attributes, source_path, config_name,
                                  target_os);
 
   return workspace.WriteFiles(build_settings, err);
 }
 
 XcodeWriter::XcodeWriter(const std::string& name) : name_(name) {
   if (name_.empty())
@@ skipping 56 matching lines @@
   return true;
 }
 
 void XcodeWriter::CreateProductsProject(
     const std::vector<const Target*>& targets,
     const PBXAttributes& attributes,
     const std::string& source_path,
     const std::string& config_name,
     const std::string& root_target,
     const std::string& ninja_extra_args,
+    const BuildSettings* build_settings,
     TargetOsType target_os) {
   std::unique_ptr<PBXProject> main_project(
       new PBXProject("products", config_name, source_path, attributes));
 
   std::string build_path;
   std::unique_ptr<base::Environment> env(base::Environment::Create());
   env->GetVar("PATH", &build_path);
 
   main_project->AddAggregateTarget(
       "All", GetBuildScript(root_target, build_path, ninja_extra_args));
@@ skipping 12 matching lines @@
             GetBuildScript(target->label().name(), build_path,
                            ninja_extra_args));
         break;
 
       case Target::CREATE_BUNDLE:
         if (target->bundle_data().product_type().empty())
           continue;
 
         main_project->AddNativeTarget(
             target->label().name(), std::string(),
-            target->bundle_data()
-                .GetBundleRootDirOutput(target->settings())
-                .Resolve(base::FilePath())
-                .AsUTF8Unsafe(),
+            RebasePath(target->bundle_data()
+                           .GetBundleRootDirOutput(target->settings())
+                           .value(),
+                       build_settings->build_dir()),
             target->bundle_data().product_type(),
             GetBuildScript(target->label().name(), build_path,
                            ninja_extra_args));
         break;
 
       default:
         break;
     }
   }
 
@@ skipping 25 matching lines @@
 
   std::unique_ptr<PBXProject> sources_for_indexing(
       new PBXProject("sources", config_name, source_path, attributes));
 
   // Sort sources to ensure determinisn of the project file generation and
   // remove duplicate reference to the source files (can happen due to the
   // bundle_data targets).
   std::sort(sources.begin(), sources.end());
   sources.erase(std::unique(sources.begin(), sources.end()), sources.end());
 
+  SourceDir source_dir("//");
   for (const SourceFile& source : sources) {
-    base::FilePath source_path = source.Resolve(base::FilePath());
-    sources_for_indexing->AddSourceFile(source_path.AsUTF8Unsafe());
+    std::string source_file = RebasePath(source.value(), source_dir);
+    sources_for_indexing->AddSourceFile(source_file);
   }
 
   projects_.push_back(std::move(sources_for_indexing));
 }
 
 bool XcodeWriter::WriteFiles(const BuildSettings* build_settings, Err* err) {
   for (const auto& project : projects_) {
     if (!WriteProjectFile(build_settings, project.get(), err))
       return false;
   }
@@ skipping 60 matching lines @@
     for (const auto& object : pair.second) {
       object->Print(out, 2);
     }
     out << "/* End " << ToString(pair.first) << " section */\n";
   }
 
   out << "\t};\n"
       << "\trootObject = " << project->Reference() << ";\n"
       << "}\n";
 }