commit 9118413608e277b4500130bc2117400f9d9b0201
author Eric Boren <borenet@google.com> Mon Jun 16 10:02:42 2014 -0400
committer Eric Boren <borenet@google.com> Mon Jun 16 10:02:42 2014 -0400
tree 0c48825850277375b1a8f0dd9dcfe3e124260ec1
parent d6e614c0aafca777fc3784766484d356acc47187

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

make.py

diff --git a/make.py b/make.py
index fc959a0..cb6c2a4 100644
--- a/make.py
+++ b/make.py
@@ -92,8 +92,9 @@
     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)