Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(18)

Unified Diff: gyp_skia

Issue 332833002: Enable compiling with automatically-downloaded VS toolchain on Windows bots (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Upload from Linux Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | make.bat » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gyp_skia
diff --git a/gyp_skia b/gyp_skia
index be90916c581761a913dde4da5a3ce1516ea3c5b9..1f3f337e7e9e6e787d1a41ef4168c96ff43d9759 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.
« no previous file with comments | « no previous file | make.bat » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698