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

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

Issue 1917243002: Revert "build: roll infra_paths changes" (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master
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/config.py
diff --git a/scripts/slave/recipe_modules/chromium/config.py b/scripts/slave/recipe_modules/chromium/config.py
index baa3f17c5fb8db276e6d67fcba1094e7d7535ef3..350f7ff174f600788ca9c919f2693d8a66dabd7d 100644
--- a/scripts/slave/recipe_modules/chromium/config.py
+++ b/scripts/slave/recipe_modules/chromium/config.py
@@ -29,7 +29,7 @@ def check(val, potentials):
# Schema for config items in this module.
def BaseConfig(HOST_PLATFORM, HOST_ARCH, HOST_BITS,
TARGET_PLATFORM, TARGET_ARCH, TARGET_BITS,
- BUILD_CONFIG, TARGET_CROS_BOARD, BUILD_PATH, **_kwargs):
+ BUILD_CONFIG, TARGET_CROS_BOARD, **_kwargs):
equal_fn = lambda tup: ('%s=%s' % (tup[0], pipes.quote(str(tup[1]))))
return ConfigGroup(
compile_py = ConfigGroup(
@@ -110,8 +110,6 @@ def BaseConfig(HOST_PLATFORM, HOST_ARCH, HOST_BITS,
TARGET_BITS = Static(check(TARGET_BITS, HOST_TARGET_BITS)),
TARGET_CROS_BOARD = Static(TARGET_CROS_BOARD),
- BUILD_PATH = Static(BUILD_PATH),
-
gn_args = List(basestring),
lto = Single(bool, empty_val=False, required=False),
@@ -313,7 +311,7 @@ def goma(c):
c.gyp_env.GYP_DEFINES['use_goma'] = 1
- goma_dir = c.BUILD_PATH.join('goma')
+ goma_dir = Path('[BUILD]', 'goma')
c.gyp_env.GYP_DEFINES['gomadir'] = goma_dir
c.compile_py.goma_dir = goma_dir

Powered by Google App Engine
This is Rietveld 408576698