Revert "build: roll infra_paths changes"

scripts/slave/recipe_modules/chromium/config.py

 # Copyright 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import pipes
 
 from recipe_engine.config import config_item_context, ConfigGroup
 from recipe_engine.config import Dict, List, Single, Static, Set, BadConf
 from recipe_engine.config_types import Path
 
@@ skipping 11 matching lines @@
 MEMORY_TOOLS = ('memcheck', 'drmemory_full', 'drmemory_light')
 PROJECT_GENERATORS = ('gyp', 'gn', 'mb')
 
 def check(val, potentials):
   assert val in potentials, (val, potentials)
   return val
 
 # 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(
       default_targets = Set(basestring),
       build_args = Single(basestring, required=False),
       build_tool = Single(basestring, required=False),
       cross_tool = Single(basestring, required=False),
       compiler = Single(basestring, required=False),
       mode = Single(basestring, required=False),
       goma_dir = Single(Path, required=False),
@@ skipping 60 matching lines @@
 
     HOST_PLATFORM = Static(check(HOST_PLATFORM, HOST_PLATFORMS)),
     HOST_ARCH = Static(check(HOST_ARCH, HOST_ARCHS)),
     HOST_BITS = Static(check(HOST_BITS, HOST_TARGET_BITS)),
 
     TARGET_PLATFORM = Static(check(TARGET_PLATFORM, TARGET_PLATFORMS)),
     TARGET_ARCH = Static(check(TARGET_ARCH, TARGET_ARCHS)),
     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),
   )
 
 config_ctx = config_item_context(BaseConfig)
 
 
 @config_ctx(is_root=True)
 def BASE(c):
@@ skipping 181 matching lines @@
 
   if not c.compile_py.compiler:
     c.compile_py.compiler = 'goma'
   elif c.compile_py.compiler == 'clang':
     c.compile_py.compiler = 'goma-clang'
   else:  # pragma: no cover
     raise BadConf('goma config doesn\'t understand %s' % c.compile_py.compiler)
 
   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
 
   if c.TARGET_PLATFORM == 'win' and c.compile_py.compiler != 'goma-clang':
     fastbuild(c)
     pch(c, invert=True)
 
 @config_ctx()
 def pch(c, invert=False):
   if c.TARGET_PLATFORM == 'win':
@@ skipping 468 matching lines @@
 def internal_gles2_conform_tests(c):
   c.gyp_env.GYP_DEFINES['internal_gles2_conform_tests'] = 1
 
 @config_ctx()
 def build_angle_deqp_tests(c):
   c.gyp_env.GYP_DEFINES['build_angle_deqp_tests'] = 1
 
 @config_ctx()
 def force_mac_toolchain(c):
   c.env.FORCE_MAC_TOOLCHAIN = 1