Enable compiling with automatically-downloaded VS toolchain on Windows bots

Requires that the bots have CHROME_HEADLESS=1 and CHROME_PATH set.

BUG=skia:2216
R=epoger@google.com

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

3 files changed, 16 insertions, 2 deletions

diff --git a/gyp_skia b/gyp_skia
index be90916c58..1f3f337e7e 100755
--- a/gyp_skia
+++ b/gyp_skia
@@ -93,6 +93,16 @@ if __name__ == '__main__':
     os.environ[ENVVAR_GYP_GENERATORS] = default_gyp_generators
   print '%s is "%s"' % (ENVVAR_GYP_GENERATORS, os.getenv(ENVVAR_GYP_GENERATORS))
 
+  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()
+
   # 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.
diff --git a/make.bat b/make.bat
index a9961074e3..2b6a629ff3 100644
--- a/make.bat
+++ b/make.bat
@@ -7,6 +7,9 @@
 rem Launches make.py on Windows, after setting Visual Studio environment variables.

 rem See http://code.google.com/p/skia/wiki/GettingStartedOnWindows

 

+rem Skip environment setup on bots.

+if "%CHROME_HEADLESS%"=="1" goto run_python

+

 if "%DevEnvDir%"=="" goto setup_env_vars

 

 :run_python

diff --git a/make.py b/make.py
index fc959a05ce..cb6c2a47fa 100644
--- a/make.py
+++ b/make.py
@@ -92,8 +92,9 @@ def MakeWindows(targets):
     parameters:

         targets: build targets as a list of strings

     """

-    # TODO(epoger): I'm not sure if this is needed for ninja builds.

-    CheckWindowsEnvironment()

+    if os.environ.get('CHROME_HEADLESS', '0') != '1':

+        # TODO(epoger): I'm not sure if this is needed for ninja builds.

+        CheckWindowsEnvironment()

 

     # Run gyp_skia to prepare Visual Studio projects.

     cd(SCRIPT_DIR)