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

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

Issue 1919193002: build: roll infra_paths changes (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build
Patch Set: 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
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 c65b91262c05115d45ee7f95a6ec720b4427f57d..cc774a24d381aa51c33b209459f1438a4d2f690b 100644
--- a/scripts/slave/recipe_modules/chromium/api.py
+++ b/scripts/slave/recipe_modules/chromium/api.py
@@ -50,6 +50,8 @@ class ChromiumApi(recipe_api.RecipeApi):
else self.m.platform.bits),
'BUILD_CONFIG': self.m.properties.get('build_config', 'Release'),
+
+ 'BUILD_PATH': self.m.infra_paths['build'],
}
def get_env(self):
@@ -162,7 +164,7 @@ class ChromiumApi(recipe_api.RecipeApi):
'--ninja-path', self.m.depot_tools.ninja_path,
'--target', target or self.c.build_config_fs,
'--src-dir', self.m.path['checkout'],
- '--goma-cache-dir', self.m.path['goma_cache'],
+ '--goma-cache-dir', self.m.infra_paths['goma_cache'],
]
if self.c.compile_py.build_args:
args += ['--build-args', self.c.compile_py.build_args]
@@ -529,7 +531,7 @@ class ChromiumApi(recipe_api.RecipeApi):
self.m.python(
name='gn',
- script=self.m.path['depot_tools'].join('gn.py'),
+ script=self.m.infra_paths['depot_tools'].join('gn.py'),
args=[
'--root=%s' % str(self.m.path['checkout']),
'gen',
@@ -564,7 +566,7 @@ class ChromiumApi(recipe_api.RecipeApi):
goma_dir = self.c.compile_py.goma_dir
if not goma_dir: # pragma: no cover
# TODO(phajdan.jr): remove fallback when we always use cipd for goma.
- goma_dir = self.m.path['build'].join('goma')
+ goma_dir = self.m.infra_paths['build'].join('goma')
args += ['--goma-dir', goma_dir]
if isolated_targets:

Powered by Google App Engine
This is Rietveld 408576698