V8 Buildbot: Use correct config folder extension for win64 and ninja.

scripts/slave/recipe_modules/v8/chromium_config.py

 # Copyright 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.
 
 from recipe_engine.config import BadConf
 from recipe_engine.config_types import Path
 from recipe_engine import config as recipe_config
 
 import DEPS
 CONFIG_CTX = DEPS['chromium'].CONFIG_CTX
@@ skipping 14 matching lines @@
   if c.HOST_PLATFORM == 'mac':
     c.compile_py.build_tool = 'xcode'
   elif c.HOST_PLATFORM == 'win':
     c.compile_py.build_tool = 'vs'
     c.build_dir = Path('[CHECKOUT]', 'build')
 
   if c.BUILD_CONFIG == 'Debug':
     c.gyp_env.GYP_DEFINES['v8_optimized_debug'] = 1
     c.gyp_env.GYP_DEFINES['v8_enable_slow_dchecks'] = 1
 
-  # Chromium adds '_x64' to the output folder, which is neither needed nor
-  # understood when compiling v8 standalone.
+  # Chromium adds '_x64' to the output folder, which is only understood when
+  # compiling v8 standalone with ninja.
   if c.HOST_PLATFORM == 'win' and c.TARGET_BITS == 64:
     c.build_config_fs = c.BUILD_CONFIG
     c.compile_py.pass_arch_flag = True
 
 
 @CONFIG_CTX(includes=['v8'])
 def arm_hard_float(c):
   c.compile_py.pass_arch_flag = True
   c.compile_py.cross_tool = '/usr/bin/arm-linux-gnueabihf'
   c.gyp_env.GYP_DEFINES['arm_float_abi'] = 'hard'
@@ skipping 28 matching lines @@
 @CONFIG_CTX(group='builder')
 def make(c):
   c.build_dir = Path('[CHECKOUT]', 'out')
   c.compile_py.build_tool = 'make'
 
 
 @CONFIG_CTX(includes=['ninja'])
 def v8_ninja(c):
   c.gyp_env.GYP_GENERATORS.add('ninja')
 
+  if c.HOST_PLATFORM == 'win' and c.TARGET_BITS == 64:
+    # Windows requires 64-bit builds to be in <dir>_x64 with ninja. See
+    # crbug.com/470681.
+    c.build_config_fs = c.BUILD_CONFIG + '_x64'
+
 
 @CONFIG_CTX(includes=['v8'])
 def no_clang(c):
   c.gyp_env.GYP_DEFINES['clang'] = 0
 
 
 @CONFIG_CTX(includes=['v8'])
 def no_dcheck(c):
   c.gyp_env.GYP_DEFINES['dcheck_always_on'] = 0
 
@@ skipping 75 matching lines @@
 def x32(c):
   c.gyp_env.GYP_DEFINES['v8_target_arch'] = 'x32'
 
 
 @CONFIG_CTX(includes=['v8'])
 def x87(c):
   # TODO(machenbach): Chromium does not support x87 yet. With the current
   # configuration, target_arch can't be set through a parameter as ARCH=intel
   # and BITS=32 is ambigue with x87.
   c.gyp_env.GYP_DEFINES['v8_target_arch'] = 'x87'