Fix Windows bots

BUG=skia:
R=mtklein@google.com, rmistry@google.com

Author: borenet@google.com

Review URL: https://codereview.chromium.org/339733002

diff --git a/gyp_skia b/gyp_skia
index 1f3f337..0b0fa7d 100755 (executable)
--- 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,8 @@ 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 +158,14 @@ 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)
+
+  # This code is copied from Chrome's build/gyp_chromium. It's not clear why
+  # the *_runtime variables are reversed.
+  if vs2013_runtime_dll_dirs:
+    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))