Revert "build: roll infra_paths changes"

scripts/slave/recipes/art.py

 # Copyright 2015 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.
 
 # TODO: remove redundant DEPS.
 DEPS = [
   'file',
-  'depot_tools/infra_paths',
   'recipe_engine/path',
   'recipe_engine/properties',
   'repo',
   'recipe_engine/step',
 ]
 
 _TARGET_DEVICE_MAP = {
     'volantis': {
       'bitness': 64,
       'make_jobs': 2,
@@ skipping 30 matching lines @@
   api.repo.sync()
 
 def full_checkout(api):
   api.repo.init('https://android.googlesource.com/platform/manifest',
       '-b', 'master')
   api.repo.sync()
 
 def clobber(api):
   # buildbot sets 'clobber' to the empty string which is falsey, check with 'in'
   if 'clobber' in api.properties:
-    api.file.rmtree('clobber', api.infra_paths['slave_build'].join('out'))
+    api.file.rmtree('clobber', api.path['slave_build'].join('out'))
 
 def setup_host_x86(api, debug, bitness, concurrent_collector=False):
   with api.step.defer_results():
     checkout(api)
     clobber(api)
 
-    build_top_dir = api.infra_paths['slave_build']
-    art_tools = api.infra_paths['slave_build'].join('art', 'tools')
+    build_top_dir = api.path['slave_build']
+    art_tools = api.path['slave_build'].join('art', 'tools')
     env = { 'TARGET_PRODUCT': 'sdk',
             'TARGET_BUILD_VARIANT': 'eng',
             'TARGET_BUILD_TYPE': 'release',
             'ANDROID_BUILD_TOP': build_top_dir,
             'LEGACY_USE_JAVA7': 'true',
             'JACK_SERVER': 'false',
             'JACK_REPOSITORY': str(build_top_dir.join('prebuilts', 'sdk',
                                                       'tools', 'jacks')),
             'PATH': str(build_top_dir.join('out', 'host', 'linux-x86', 'bin')) +
                         api.path.pathsep + '%(PATH)s',
@@ skipping 49 matching lines @@
                     '--variant=X%d' % bitness]
     if debug:
       jdwp_command.append('--debug')
     api.step('test jdwp', jdwp_command, env=env)
 
 def setup_target(api,
     serial,
     debug,
     device,
     concurrent_collector=False):
-  build_top_dir = api.infra_paths['slave_build']
-  art_tools = api.infra_paths['slave_build'].join('art', 'tools')
+  build_top_dir = api.path['slave_build']
+  art_tools = api.path['slave_build'].join('art', 'tools')
   android_root = '/data/local/tmp/system'
 
   env = {'TARGET_BUILD_VARIANT': 'eng',
          'TARGET_BUILD_TYPE': 'release',
          'ANDROID_SERIAL': serial,
          'ANDROID_BUILD_TOP': build_top_dir,
          'PATH': str(build_top_dir.join('out', 'host', 'linux-x86', 'bin')) +
                      api.path.pathsep + '%(PATH)s',
           'LEGACY_USE_JAVA7': 'true',
          'JACK_SERVER': 'false',
@@ skipping 325 matching lines @@
 #      )
 #    )
 #  yield (
 #      api.test('invalid buildername') +
 #      api.properties(
 #        mastername='client.art',
 #        buildername='builder_does_not_exist',
 #        slavename='TestSlave',
 #      )
 #    )