Make get_label_info take into account the toolchain for target_gen_dir

tools/gn/function_get_label_info.cc

 // Copyright 2014 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/err.h"
 #include "tools/gn/filesystem_utils.h"
 #include "tools/gn/functions.h"
 #include "tools/gn/label.h"
 #include "tools/gn/parse_tree.h"
 #include "tools/gn/value.h"
@@ skipping 99 matching lines @@
   const std::string& what = args[1].string_value();
 
   Value result(function, Value::STRING);
   if (what == "name") {
     result.string_value() = label.name();
 
   } else if (what == "dir") {
     result.string_value() = DirectoryWithNoLastSlash(label.dir());
 
   } else if (what == "target_gen_dir") {
-    result.string_value() = DirectoryWithNoLastSlash(
-        GetGenDirForSourceDir(scope->settings(), label.dir()));
+    result.string_value() = DirectoryWithNoLastSlash(GetSubBuildDirAsSourceDir(
+        BuildDirContext(scope, label.GetToolchainLabel()),

[brettw, 2016/08/01 21:53:54]

This is the actual bugfix.

+        label.dir(),
+        BuildDirType::GEN));
 
   } else if (what == "root_gen_dir") {
-    Label toolchain_label = label.GetToolchainLabel();
-    result.string_value() = DirectoryWithNoLastSlash(
-        GetToolchainGenDir(scope->settings()->build_settings(),
-                           toolchain_label,
-                           ToolchainIsDefault(scope, toolchain_label)));
+    result.string_value() = DirectoryWithNoLastSlash(GetBuildDirAsSourceDir(
+        BuildDirContext(scope, label.GetToolchainLabel()), BuildDirType::GEN));
 
   } else if (what == "target_out_dir") {
-    Label toolchain_label = label.GetToolchainLabel();
-    result.string_value() = DirectoryWithNoLastSlash(
-        GetOutputDirForSourceDir(scope->settings()->build_settings(),
-                                 label.dir(), toolchain_label,
-                                 ToolchainIsDefault(scope, toolchain_label)));
+    result.string_value() = DirectoryWithNoLastSlash(GetSubBuildDirAsSourceDir(
+        BuildDirContext(scope, label.GetToolchainLabel()),
+        label.dir(),
+        BuildDirType::OBJ));
 
   } else if (what == "root_out_dir") {
-    Label toolchain_label = label.GetToolchainLabel();
-    result.string_value() = DirectoryWithNoLastSlash(
-        GetToolchainOutputDir(scope->settings()->build_settings(),
-                              toolchain_label,
-                              ToolchainIsDefault(scope, toolchain_label)));
+    result.string_value() = DirectoryWithNoLastSlash(GetBuildDirAsSourceDir(
+        BuildDirContext(scope, label.GetToolchainLabel()),
+        BuildDirType::TOOLCHAIN_ROOT));
 
   } else if (what == "toolchain") {
     result.string_value() = label.GetToolchainLabel().GetUserVisibleName(false);
 
   } else if (what == "label_no_toolchain") {
     result.string_value() =
         label.GetWithNoToolchain().GetUserVisibleName(false);
 
   } else if (what == "label_with_toolchain") {
     result.string_value() = label.GetUserVisibleName(true);
 
   } else {
     *err = Err(args[1], "Unknown value for \"what\" parameter.");
     return Value();
   }
 
   return result;
 }
 
 }  // namespace functions