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

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

Issue 59233015: Make gyp target_arch setting native to chromium/config.py (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build
Patch Set: rebase again Created 7 years, 1 month 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 da29efcda23f7201846cd8189b96f2311480c439..49dec504419680efa5787a6db9fe049a3a8d6564 100644
--- a/scripts/slave/recipe_modules/chromium/api.py
+++ b/scripts/slave/recipe_modules/chromium/api.py
@@ -14,9 +14,17 @@ class ChromiumApi(recipe_api.RecipeApi):
'TARGET_PLATFORM': self.m.platform.name,
'TARGET_ARCH': self.m.platform.arch,
- # This should probably default to the platform.bits, but right now this
- # is the more expected configuration.
- 'TARGET_BITS': 32,
+ # NOTE: This is replicating logic which lives in
+ # chrome/trunk/src/build/common.gypi, which is undesirable. The desired
+ # end-state is that all the configuration logic lives in one place
+ # (in chromium/config.py), and the buildside gypfiles are as dumb as
+ # possible. However, since the recipes need to accurately contain
+ # {TARGET,HOST}_{BITS,ARCH,PLATFORM}, for use across many tools (of which
+ # gyp is one tool), we're taking a small risk and replicating the logic
+ # here.
+ 'TARGET_BITS': (
+ 32 if self.m.platform.name in ('mac', 'win')
+ else self.m.platform.bits),
'BUILD_CONFIG': self.m.properties.get('build_config', 'Release')
}
« no previous file with comments | « no previous file | scripts/slave/recipe_modules/chromium/config.py » ('j') | scripts/slave/recipe_modules/chromium/config.py » ('J')

Powered by Google App Engine
This is Rietveld 408576698