Make goma work on win GN builds.

build/vs_toolchain.py

 # 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.
 
 import json
 import os
 import pipes
 import shutil
 import subprocess
 import sys
@@ skipping 163 matching lines @@
         os.path.join(depot_tools_path,
                     'win_toolchain',
                     'get_toolchain_if_necessary.py'),
         '--output-json', json_data_file,
       ] + _GetDesiredVsToolchainHashes()
     subprocess.check_call(get_toolchain_args)
 
   return 0
 
 
-def GetToolchainDir():
+def GetToolchainDir(cpu_arch):
   """Gets location information about the current toolchain (must have been
   previously updated by 'update'). This is used for the GN build."""
   runtime_dll_dirs = SetEnvironmentAndGetRuntimeDllDirs()
 
   # If WINDOWSSDKDIR is not set, search the default SDK path and set it.
   if not 'WINDOWSSDKDIR' in os.environ:
     default_sdk_path = 'C:\\Program Files (x86)\\Windows Kits\\8.1'
     if os.path.isdir(default_sdk_path):
       os.environ['WINDOWSSDKDIR'] = default_sdk_path
 
+  # We only support the 64-bit toolchains, but we need to point
+  # GN to either the 32-bit-generating one or the 64-bit-generating one.
+  assert(cpu_arch in ("x86", "x64"))
+  if cpu_arch == 'x86':
+    vc_bin_subdir = 'amd64_x86'

[scottmg, 2014/11/21 02:35:41]

this was what i didn't really want; the toolchain has already set up the paths,
so I think finding it there better.

[Dirk Pranke, 2014/11/21 02:46:00]

Okay, I think I understand the concerns now. I will take another look.

+  else:
+    vc_bin_subdir = 'amd64'
+
+  vs_path = os.environ['GYP_MSVS_OVERRIDE_PATH']

[scottmg, 2014/11/21 02:35:41]

gyp_msvs_override_path won't be set on the non-depot_tools path. there's going
to be need to be a registry search in setup_toolchain for that, so it would be
good to communicate the information from there rather than re-find it.

[Dirk Pranke, 2014/11/21 02:46:00]

Ack.

+  vc_bin_dir = os.path.join(vs_path, 'VC', 'bin', vc_bin_subdir)
+
   print '''vs_path = "%s"
 sdk_path = "%s"
 vs_version = "%s"
 wdk_dir = "%s"
 runtime_dirs = "%s"
+vc_bin_dir = "%s"
 ''' % (
-      os.environ['GYP_MSVS_OVERRIDE_PATH'],
+      vs_path,
       os.environ['WINDOWSSDKDIR'],
       os.environ['GYP_MSVS_VERSION'],
       os.environ.get('WDK_DIR', ''),
-      ';'.join(runtime_dll_dirs))
+      ';'.join(runtime_dll_dirs),
+     vc_bin_dir)
 
 
 def main():
   if not sys.platform.startswith(('win32', 'cygwin')):
     return 0
   commands = {
       'update': Update,
       'get_toolchain_dir': GetToolchainDir,
       'copy_dlls': CopyDlls,
   }
   if len(sys.argv) < 2 or sys.argv[1] not in commands:
     print >>sys.stderr, 'Expected one of: %s' % ', '.join(commands)
     return 1
   return commands[sys.argv[1]](*sys.argv[2:])
 
 
 if __name__ == '__main__':
   sys.exit(main())