Revert "Pull chromium at 2c3ffb2355a27c32f45e508ef861416b820c823b"

build/toolchain/win/setup_toolchain.py

 # Copyright (c) 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.
 #
 # Copies the given "win tool" (which the toolchain uses to wrap compiler
 # invocations) and the environment blocks for the 32-bit and 64-bit builds on
 # Windows to the build directory.
 #
 # The arguments are the visual studio install location and the location of the
 # win tool. The script assumes that the root build directory is the current dir
@@ skipping 33 matching lines @@
           setting = os.path.dirname(sys.executable) + os.pathsep + setting
         env[var.upper()] = setting
         break
   for required in ('SYSTEMROOT', 'TEMP', 'TMP'):
     if required not in env:
       raise Exception('Environment variable "%s" '
                       'required to be set to valid path' % required)
   return env
 
 
-def _SetupScript(target_cpu, sdk_dir):
+def _SetupScript(target_arch, sdk_dir):
   """Returns a command (with arguments) to be used to set up the
   environment."""
   # Check if we are running in the SDK command line environment and use
-  # the setup script from the SDK if so. |target_cpu| should be either
+  # the setup script from the SDK if so. |target_arch| should be either
   # 'x86' or 'x64'.
-  assert target_cpu in ('x86', 'x64')
+  assert target_arch in ('x86', 'x64')
   if bool(int(os.environ.get('DEPOT_TOOLS_WIN_TOOLCHAIN', 1))) and sdk_dir:
     return [os.path.normpath(os.path.join(sdk_dir, 'Bin/SetEnv.Cmd')),
-            '/' + target_cpu]
+            '/' + target_arch]
   else:
     # We only support x64-hosted tools.
     # TODO(scottmg|dpranke): Non-depot_tools toolchain: need to get Visual
     # Studio install location from registry.
     return [os.path.normpath(os.path.join(os.environ['GYP_MSVS_OVERRIDE_PATH'],
                                           'VC/vcvarsall.bat')),
-            'amd64_x86' if target_cpu == 'x86' else 'amd64']
+            'amd64_x86' if target_arch == 'x86' else 'amd64']
 
 
 def _FormatAsEnvironmentBlock(envvar_dict):
   """Format as an 'environment block' directly suitable for CreateProcess.
   Briefly this is a list of key=value\0, terminated by an additional \0. See
   CreateProcess documentation for more details."""
   block = ''
   nul = '\0'
   for key, value in envvar_dict.iteritems():
     block += key + '=' + value + nul
@@ skipping 12 matching lines @@
   with open("gyp-win-tool", 'w') as tool_file:
     tool_file.write(''.join([tool_source[0],
                              '# Generated by setup_toolchain.py do not edit.\n']
                             + tool_source[1:]))
 
 
 def main():
   if len(sys.argv) != 6:
     print('Usage setup_toolchain.py '
           '<visual studio path> <win tool path> <win sdk path> '
-          '<runtime dirs> <target_cpu>')
+          '<runtime dirs> <cpu_arch>')
     sys.exit(2)
   tool_source = sys.argv[2]
   win_sdk_path = sys.argv[3]
   runtime_dirs = sys.argv[4]
-  target_cpu = sys.argv[5]
+  cpu_arch = sys.argv[5]
 
   _CopyTool(tool_source)
 
-  cpus = ('x86', 'x64')
-  assert target_cpu in cpus
+  archs = ('x86', 'x64')
+  assert cpu_arch in archs
   vc_bin_dir = ''
 
   # TODO(scottmg|goma): Do we need an equivalent of
   # ninja_use_custom_environment_files?
 
-  for cpu in cpus:
+  for arch in archs:
     # Extract environment variables for subprocesses.
-    args = _SetupScript(cpu, win_sdk_path)
+    args = _SetupScript(arch, win_sdk_path)
     args.extend(('&&', 'set'))
     popen = subprocess.Popen(
         args, shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
     variables, _ = popen.communicate()
     env = _ExtractImportantEnvironment(variables)
     env['PATH'] = runtime_dirs + ';' + env['PATH']
 
-    if cpu == target_cpu:
+    if arch == cpu_arch:
       for path in env['PATH'].split(os.pathsep):
         if os.path.exists(os.path.join(path, 'cl.exe')):
           vc_bin_dir = os.path.realpath(path)
           break
 
     # The Windows SDK include directories must be first. They both have a sal.h,
     # and the SDK one is newer and the SDK uses some newer features from it not
     # present in the Visual Studio one.
 
     if win_sdk_path:
       additional_includes = ('{sdk_dir}\\Include\\shared;' +
                              '{sdk_dir}\\Include\\um;' +
                              '{sdk_dir}\\Include\\winrt;').format(
                                   sdk_dir=win_sdk_path)
       env['INCLUDE'] = additional_includes + env['INCLUDE']
     env_block = _FormatAsEnvironmentBlock(env)
-    with open('environment.' + cpu, 'wb') as f:
+    with open('environment.' + arch, 'wb') as f:
       f.write(env_block)
 
   assert vc_bin_dir
   print 'vc_bin_dir = "%s"' % vc_bin_dir
 
 
 if __name__ == '__main__':
   main()