Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / tools / gn / ninja_helper.cc

diff --git a/src/tools/gn/ninja_helper.cc b/src/tools/gn/ninja_helper.cc
index 849ec4d..75843ee 100644 (file)
--- a/src/tools/gn/ninja_helper.cc
+++ b/src/tools/gn/ninja_helper.cc
@@ -5,6 +5,7 @@
 #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"
@@ -25,7 +26,6 @@ NinjaHelper::NinjaHelper(const BuildSettings* build_settings)
     build_to_src_no_last_slash_.resize(build_to_src_no_last_slash_.size() - 1);
 
   build_to_src_system_no_last_slash_ = build_to_src_no_last_slash_;
-  ConvertPathToSystem(&build_to_src_system_no_last_slash_);
 }
 
 NinjaHelper::~NinjaHelper() {
@@ -35,15 +35,16 @@ std::string NinjaHelper::GetTopleveOutputDir() const {
   return kObjectDirNoSlash;
 }
 
-std::string NinjaHelper::GetTargetOutputDir(const Target* target) const {
-  return kObjectDirNoSlash + target->label().dir().SourceAbsoluteWithOneSlash();
-}
-
-OutputFile NinjaHelper::GetNinjaFileForTarget(const Target* target) const {
+OutputFile NinjaHelper::GetTargetOutputDir(const Target* target) const {
   OutputFile ret(target->settings()->toolchain_output_subdir());
   ret.value().append(kObjectDirNoSlash);
   AppendStringPiece(&ret.value(),
                     target->label().dir().SourceAbsoluteWithOneSlash());
+  return ret;
+}
+
+OutputFile NinjaHelper::GetNinjaFileForTarget(const Target* target) const {
+  OutputFile ret = GetTargetOutputDir(target);
   ret.value().append(target->label().name());
   ret.value().append(".ninja");
   return ret;
@@ -86,6 +87,33 @@ OutputFile NinjaHelper::GetOutputFileForSource(
       name.append("res");
       break;
 
+    // Pass .o/.obj files through unchanged.
+    case SOURCE_O: {
+      // System-absolute file names get preserved (they don't need to be
+      // rebased relative to the build dir).
+      if (source.is_system_absolute())
+        return OutputFile(source.value());
+
+      // Files that are already inside the build dir should not be made
+      // relative to the source tree. Doing so will insert an unnecessary
+      // "../.." into the path which won't match the corresponding target
+      // name in ninja.
+      CHECK(build_settings_->build_dir().is_source_absolute());
+      CHECK(source.is_source_absolute());
+      if (StartsWithASCII(source.value(),
+                          build_settings_->build_dir().value(),
+                          true)) {
+        return OutputFile(
+            source.value().substr(
+                build_settings_->build_dir().value().size()));
+      }
+
+      // Construct the relative location of the file from the build dir.
+      OutputFile ret(build_to_src_no_last_slash());
+      source.SourceAbsoluteWithOneSlash().AppendToString(&ret.value());
+      return ret;
+    }
+
     case SOURCE_H:
     case SOURCE_UNKNOWN:
       NOTREACHED();
@@ -213,23 +241,18 @@ std::string NinjaHelper::GetRuleForSourceType(const Settings* settings,
     return prefix + "cc";
   if (type == SOURCE_CC)
     return prefix + "cxx";
+  if (type == SOURCE_M)
+    return prefix + "objc";
+  if (type == SOURCE_MM)
+    return prefix + "objcxx";
+  if (type == SOURCE_RC)
+    return prefix + "rc";
+  if (type == SOURCE_S)
+    return prefix + "cc";  // Assembly files just get compiled by CC.
 
   // TODO(brettw) asm files.
 
-  if (settings->IsMac()) {
-    if (type == SOURCE_M)
-      return prefix + "objc";
-    if (type == SOURCE_MM)
-      return prefix + "objcxx";
-  }
-
-  if (settings->IsWin()) {
-    if (type == SOURCE_RC)
-      return prefix + "rc";
-  } else {
-    if (type == SOURCE_S)
-      return prefix + "cc";  // Assembly files just get compiled by CC.
-  }
-
+  // .obj files have no rules to make them (they're already built) so we return
+  // the enpty string for SOURCE_O.
   return std::string();
 }