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

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

Issue 1923883003: build: use class path bases, not strings (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build
Patch Set: rebase 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 | « infra/config/recipes.cfg ('k') | scripts/slave/recipe_modules/chromium/config.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 4c3514e76de2344dbd21ccd08e524f332673a1ea..14227c97cc95b0a2a5c41f5b3f71dcfff4df8e69 100644
--- a/scripts/slave/recipe_modules/chromium/api.py
+++ b/scripts/slave/recipe_modules/chromium/api.py
@@ -28,7 +28,7 @@ class ChromiumApi(recipe_api.RecipeApi):
self._build_properties = None
def get_config_defaults(self):
- return {
+ defaults = {
'HOST_PLATFORM': self.m.platform.name,
'HOST_ARCH': self.m.platform.arch,
'HOST_BITS': self.m.platform.bits,
@@ -50,8 +50,19 @@ class ChromiumApi(recipe_api.RecipeApi):
else self.m.platform.bits),
'BUILD_CONFIG': self.m.properties.get('build_config', 'Release'),
+
+ 'CHECKOUT_PATH': self.m.path['checkout'],
}
+ # Fallback in case build path is not available.
+ # TODO(phajdan.jr): get rid of the need for BUILD_PATH in config.
+ try:
+ defaults['BUILD_PATH'] = self.m.path['build']
+ except KeyError:
+ defaults['BUILD_PATH'] = self.package_repo_resource()
+
+ return defaults
+
def get_env(self):
ret = {}
if self.c.env.PATH:
« no previous file with comments | « infra/config/recipes.cfg ('k') | scripts/slave/recipe_modules/chromium/config.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698