Revert "build: roll infra_paths changes"

scripts/slave/recipe_modules/chromium/api.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 re
 
 from recipe_engine import recipe_api
 from recipe_engine import util as recipe_util
 
 class TestLauncherFilterFileInputPlaceholder(recipe_util.InputPlaceholder):
@@ skipping 32 matching lines @@
       # (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 == 'win'
         else self.m.platform.bits),
 
       'BUILD_CONFIG': self.m.properties.get('build_config', 'Release'),
-
-      'BUILD_PATH': self.m.infra_paths['build'],
     }
 
   def get_env(self):
     ret = {}
     if self.c.env.PATH:
       ret['PATH'] = self.m.path.pathsep.join(
           map(str, self.c.env.PATH) + ['%(PATH)s'])
     if self.c.env.ADB_VENDOR_KEYS:
       ret['ADB_VENDOR_KEYS'] = self.c.env.ADB_VENDOR_KEYS
     if self.c.env.LLVM_FORCE_HEAD_REVISION:
@@ skipping 92 matching lines @@
       self._clang_version = self.get_clang_version()
 
     args = [
       '--show-path',
       'python',
       self.package_repo_resource('scripts', 'slave', 'compile.py'),
       '--gsutil-py-path', self.m.depot_tools.gsutil_py_path,
       '--ninja-path', self.m.depot_tools.ninja_path,
       '--target', target or self.c.build_config_fs,
       '--src-dir', self.m.path['checkout'],
-      '--goma-cache-dir', self.m.infra_paths['goma_cache'],
+      '--goma-cache-dir', self.m.path['goma_cache'],
     ]
     if self.c.compile_py.build_args:
       args += ['--build-args', self.c.compile_py.build_args]
     if self.c.compile_py.build_tool:
       args += ['--build-tool', self.c.compile_py.build_tool]
     if self.m.properties.get('build_data_dir'):
       args += ['--build-data-dir', self.m.properties.get('build_data_dir')]
     if self.c.compile_py.cross_tool:
       args += ['--crosstool', self.c.compile_py.cross_tool]
     if self.c.compile_py.compiler:
@@ skipping 346 matching lines @@
     # rather than setting the gn_args flags via a parameter passed to
     # run_gn(). We shouldn't have *three* different mechanisms to control
     # what args to use.
     if use_goma:
       gn_args.append('use_goma=true')
       gn_args.append('goma_dir="%s"' % self.c.compile_py.goma_dir)
     gn_args.extend(self.c.project_generator.args)
 
     self.m.python(
         name='gn',
-        script=self.m.infra_paths['depot_tools'].join('gn.py'),
+        script=self.m.path['depot_tools'].join('gn.py'),
         args=[
             '--root=%s' % str(self.m.path['checkout']),
             'gen',
             build_dir,
             '--args=%s' % ' '.join(gn_args),
         ])
 
   def run_mb(self, mastername, buildername, use_goma=True,
              mb_config_path=None, isolated_targets=None, name=None,
              build_dir=None, android_version_code=None,
@@ skipping 14 matching lines @@
     if use_goma:
       goma_dir = self.c.compile_py.goma_dir
       if not goma_dir:
         # This method defaults to use_goma=True, which doesn't necessarily
         # match build-side configuration. However, MB is configured
         # src-side, and so it might be actually using goma.
         self.ensure_goma()
         goma_dir = self.c.compile_py.goma_dir
       if not goma_dir:  # pragma: no cover
         # TODO(phajdan.jr): remove fallback when we always use cipd for goma.
-        goma_dir = self.m.infra_paths['build'].join('goma')
+        goma_dir = self.m.path['build'].join('goma')
       args += ['--goma-dir', goma_dir]
 
     if isolated_targets:
       sorted_isolated_targets = sorted(set(isolated_targets))
       # TODO(dpranke): Change the MB flag to '--isolate-targets-file', maybe?
       data = '\n'.join(sorted_isolated_targets) + '\n'
       args += ['--swarming-targets-file', self.m.raw_io.input(data)]
 
     if android_version_code:
       args += ['--android-version-code=%s' % android_version_code]
@@ skipping 132 matching lines @@
       }))
 
   def get_annotate_by_test_name(self, test_name):
     return 'graphing'
 
   def download_lto_plugin(self):
     return self.m.python(
         name='download LTO plugin',
         script=self.m.path['checkout'].join(
             'build', 'download_gold_plugin.py'))