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

Unified Diff: scripts/slave/recipe_modules/chromium/config.py

Issue 134193014: Make recipes use the new way of enabling goma. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build/
Patch Set: Created 6 years, 10 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
Index: scripts/slave/recipe_modules/chromium/config.py
===================================================================
--- scripts/slave/recipe_modules/chromium/config.py (revision 248765)
+++ scripts/slave/recipe_modules/chromium/config.py (working copy)
@@ -32,6 +32,7 @@
build_tool = Single(basestring),
compiler = Single(basestring, required=False),
mode = Single(basestring, required=False),
+ goma_dir = Single(Path, required=False),
clobber = Single(bool, empty_val=False, required=False, hidden=False),
),
gyp_env = ConfigGroup(
@@ -192,6 +193,12 @@
else: # pragma: no cover
raise BadConf('goma config dosen\'t understand %s' % c.compile_py.compiler)
+ c.gyp_env.GYP_DEFINES['use_goma'] = 1
+
+ goma_dir = Path('[BUILD]', 'goma')
Nico 2014/02/04 19:57:02 To make sure: [BUILD] evaluates to the root of the
Paweł Hajdan Jr. 2014/02/04 20:40:15 Yes. I tested this locally.
+ c.gyp_env.GYP_DEFINES['gomadir'] = goma_dir
+ c.compile_py.goma_dir = goma_dir
+
if c.TARGET_PLATFORM == 'win':
fastbuild(c)
pch(c, invert=True)

Powered by Google App Engine
This is Rietveld 408576698