Fix Windows bots

gyp_skia

 #!/usr/bin/python
 
 # Copyright 2011 The Android Open Source Project
 #
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # This script is a wrapper which invokes gyp with the correct --depth argument,
 # and supports the automatic regeneration of build files if all.gyp is
 # changed (Linux-only).
@@ skipping 75 matching lines @@
       default_gyp_generators = 'ninja,xcode'
     elif sys.platform.startswith('win'):
       default_gyp_generators = 'ninja,msvs-ninja'
     elif sys.platform.startswith('cygwin'):
       default_gyp_generators = 'ninja,msvs-ninja'
     else:
       default_gyp_generators = 'ninja'
     os.environ[ENVVAR_GYP_GENERATORS] = default_gyp_generators
   print '%s is "%s"' % (ENVVAR_GYP_GENERATORS, os.getenv(ENVVAR_GYP_GENERATORS))
 
+  vs2013_runtime_dll_dirs = None
   if os.getenv('CHROME_HEADLESS', '0') == '1':
     if sys.platform.startswith('win') or sys.platform.startswith('cygwin'):
       chrome_path = os.getenv('CHROME_PATH')
       os.chdir(chrome_path)
       sys.path.append(os.path.join(chrome_path, 'build'))
       sys.path.append(os.path.join(chrome_path, 'tools'))
       import vs_toolchain
-      vs_toolchain.Update()
-      vs_toolchain.GetToolchainDir()
+      vs2013_runtime_dll_dirs = vs_toolchain.SetEnvironmentAndGetRuntimeDllDirs()
 
   # Set CWD to the directory containing this script.
   # This allows us to launch it from other directories, in spite of gyp's
   # finickyness about the current working directory.
   # See http://b.corp.google.com/issue?id=5019517 ('Linux make build
   # (from out dir) no longer runs skia_gyp correctly')
   os.chdir(os.path.abspath(script_dir))
 
   # This could give false positives since it doesn't actually do real option
   # parsing.  Oh well.
@@ skipping 35 matching lines @@
   os.environ['GYP_LINK_CONCURRENCY'] = '9001'
 
   print 'Updating projects from gyp files...'
   sys.stdout.flush()
 
   if '--dry-run' in args:
     args.remove('--dry-run')
     print gyp_source_dir, ' '.join(args)
   else:
     # Off we go...
-    sys.exit(gyp.main(args))
+    res = gyp.main(args)
+    if res:
+      sys.exit(res)
+
+  if vs2013_runtime_dll_dirs:

[mtklein, 2014/06/16 19:11:29]

Can this run before gyp?  If so, that can become sys.exit(gyp.main(args)) ?

[borenet, 2014/06/16 19:19:08]

No. The out/* directories need to be created before we can copy the dlls there.

+    x64_runtime, x86_runtime = vs2013_runtime_dll_dirs
+    vs_toolchain.CopyVsRuntimeDlls(
+        os.path.join(os.getenv('CHROME_PATH'), get_output_dir()),
+        (x86_runtime, x64_runtime))

[mtklein, 2014/06/16 19:11:29]

Add a comment reassuring us the inverted order is correct?

[borenet, 2014/06/16 19:19:07]

Added not-so-reassuring comment.