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

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

Issue 1916303006: Fix GOMA_SERVICE_ACCOUNT_JSON_FILE propagation in mb. (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master
Patch Set: make sure GOMA_SERVICE_ACCOUNT_JSON_FILE is present in generate_build_files, too Created 4 years, 8 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/chromium/example.expected/basic_out_dir.json » ('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 a2a1e0df0a67e18f26f4da626405fa6aa24e2024..98a1aa4e9b5028968517cbc7087002f885dac3be 100644
--- a/scripts/slave/recipe_modules/chromium/api.py
+++ b/scripts/slave/recipe_modules/chromium/api.py
@@ -580,12 +580,15 @@ class ChromiumApi(recipe_api.RecipeApi):
args += [build_dir]
- # This runs with no env being passed along, so we get a clean environment
- # without any GYP_DEFINES being present to cause confusion.
+ # 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 = {
'name': name or 'generate_build_files',
'script': self.m.path['checkout'].join('tools', 'mb', 'mb.py'),
'args': args,
+ 'env': {
+ 'GOMA_SERVICE_ACCOUNT_JSON_FILE': self.m.goma.service_account_json_path,
+ }
}
if self.c.TARGET_CROS_BOARD:
# Wrap 'runhooks' through 'cros chrome-sdk'
« no previous file with comments | « no previous file | scripts/slave/recipe_modules/chromium/example.expected/basic_out_dir.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698