build: roll infra_paths changes

scripts/slave/recipe_modules/chromium/config.py

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 350f7ff174f600788ca9c919f2693d8a66dabd7d..baa3f17c5fb8db276e6d67fcba1094e7d7535ef3 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, **_kwargs):
+               BUILD_CONFIG, TARGET_CROS_BOARD, BUILD_PATH, **_kwargs):
   equal_fn = lambda tup: ('%s=%s' % (tup[0], pipes.quote(str(tup[1]))))
   return ConfigGroup(
     compile_py = ConfigGroup(
@@ -110,6 +110,8 @@ 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),
@@ -311,7 +313,7 @@ def goma(c):
 
   c.gyp_env.GYP_DEFINES['use_goma'] = 1
 
-  goma_dir = Path('[BUILD]', 'goma')
+  goma_dir = c.BUILD_PATH.join('goma')
   c.gyp_env.GYP_DEFINES['gomadir'] = goma_dir
   c.compile_py.goma_dir = goma_dir