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

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

Issue 2070003002: V8: Let peek-gn use mb to reuse v8-side configs. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build
Patch Set: Review Created 4 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 | scripts/slave/recipe_modules/v8/api.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/slave/recipe_modules/chromium/api.py
diff --git a/scripts/slave/recipe_modules/chromium/api.py b/scripts/slave/recipe_modules/chromium/api.py
index 8870c95734d03a42df0835dffb8883da586832bf..997c957a76f3c602506f02f0b8fdf6c4b7dbd2d5 100644
--- a/scripts/slave/recipe_modules/chromium/api.py
+++ b/scripts/slave/recipe_modules/chromium/api.py
@@ -577,7 +577,7 @@ class ChromiumApi(recipe_api.RecipeApi):
def run_mb(self, mastername, buildername, use_goma=True,
mb_config_path=None, isolated_targets=None, name=None,
build_dir=None, android_version_code=None,
- android_version_name=None, gyp_script=None):
+ android_version_name=None, gyp_script=None, **kwargs):
mb_config_path = (mb_config_path or
self.m.path['checkout'].join('tools', 'mb',
'mb_config.pyl'))
@@ -627,7 +627,7 @@ class ChromiumApi(recipe_api.RecipeApi):
# This runs with an almost-bare env being passed along, so we get a clean
# environment without any GYP_DEFINES being present to cause confusion.
- kwargs = {
+ step_kwargs = {
'name': name or 'generate_build_files',
'script': self.m.path['checkout'].join('tools', 'mb', 'mb.py'),
'args': args,
@@ -636,13 +636,15 @@ class ChromiumApi(recipe_api.RecipeApi):
}
}
if self.c.env.FORCE_MAC_TOOLCHAIN:
- kwargs['env']['FORCE_MAC_TOOLCHAIN'] = self.c.env.FORCE_MAC_TOOLCHAIN
+ step_kwargs['env']['FORCE_MAC_TOOLCHAIN'] = (
+ self.c.env.FORCE_MAC_TOOLCHAIN)
if self.c.TARGET_CROS_BOARD:
# Wrap 'runhooks' through 'cros chrome-sdk'
- kwargs['wrapper'] = self.get_cros_chrome_sdk_wrapper(clean=True)
+ step_kwargs['wrapper'] = self.get_cros_chrome_sdk_wrapper(clean=True)
- self.m.python(**kwargs)
+ step_kwargs.update(kwargs)
+ self.m.python(**step_kwargs)
# Comes after self.m.python so the log appears in the correct step result.
result = self.m.step.active_result
« no previous file with comments | « no previous file | scripts/slave/recipe_modules/v8/api.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698