Fix Windows bots

gyp_skia

Index: gyp_skia
diff --git a/gyp_skia b/gyp_skia
index 1f3f337e7e9e6e787d1a41ef4168c96ff43d9759..f8f6d95cc00c00cd57110ad2d0d8e53df4294660 100755
--- a/gyp_skia
+++ b/gyp_skia
@@ -93,6 +93,7 @@ if __name__ == '__main__':
     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')
@@ -100,8 +101,7 @@ if __name__ == '__main__':
       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
@@ -157,4 +157,12 @@ if __name__ == '__main__':
     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.