Revert "build: roll infra_paths changes"

scripts/slave/recipes/client.nacl.sdk.recipe_autogen.py

 # Copyright 2016 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.
 
 DEPS = [
     'chromium',
     'depot_tools/bot_update',
     'depot_tools/gclient',
-    'depot_tools/infra_paths',
     'recipe_engine/json',
     'recipe_engine/path',
     'recipe_engine/properties',
     'recipe_engine/python',
     'recipe_engine/step',
 ]
 
 
 def linux_sdk_multi_steps(api):
     build_properties = api.properties.legacy()
@@ skipping 43 matching lines @@
     result = api.bot_update.ensure_checkout(force=True)
     build_properties.update(result.json.output.get("properties", {}))
     # gclient revert step; made unnecessary by bot_update
     # gclient update step; made unnecessary by bot_update
     # gclient runhooks wrapper step
     env = {'CHROMIUM_GYP_SYNTAX_CHECK': '1',
            'LANDMINES_VERBOSE': '1',
            'DEPOT_TOOLS_UPDATE': '0',
            'GYP_DEFINES': 'fastbuild=1 component=static_library'}
     api.python("gclient runhooks wrapper",
-               api.infra_paths['build'].join("scripts", "slave",
+               api.path["build"].join("scripts", "slave",
                                       "runhooks_wrapper.py"),
                env=env)
     # cleanup_temp step
     api.chromium.cleanup_temp()
     # compile.py step
     args = ['--target', 'Release', '--clobber', '--compiler=goma',
             'chromium_builder_nacl_sdk']
     api.python("compile",
-               api.infra_paths['build'].join("scripts", "slave", "compile.py"),
+               api.path["build"].join("scripts", "slave", "compile.py"),
                args=args)
     # annotated_steps step
     api.python(
         "annotated_steps",
-        api.infra_paths['build'].join("scripts", "slave", "chromium",
+        api.path["build"].join("scripts", "slave", "chromium",
                                "nacl_sdk_buildbot_run.py"),
         args=
         ['--build-properties=%s' % api.json.dumps(build_properties,
                                                   separators=(',', ':')),
          '--factory-properties={"annotated_script":"nacl_sdk_buildbot_run.py"'+\
              ',"blink_config":"chromium",'+\
              '"gclient_env":{"CHROMIUM_GYP_SYNTAX_CHECK":"1",'+\
              '"DEPOT_TOOLS_UPDATE":"0","GYP_DEFINES":'+\
              '"fastbuild=1 component=static_library","LANDMINES_VERBOSE":"1"'+\
              '},"no_gclient_branch":true,"nuke_and_pave":false}'
@@ skipping 50 matching lines @@
     build_properties.update(result.json.output.get("properties", {}))
     # gclient revert step; made unnecessary by bot_update
     # gclient update step; made unnecessary by bot_update
     # gclient runhooks wrapper step
     env = {'CHROMIUM_GYP_SYNTAX_CHECK': '1',
            'GYP_GENERATORS': 'ninja',
            'DEPOT_TOOLS_UPDATE': '0',
            'GYP_DEFINES': 'fastbuild=1 component=static_library',
            'LANDMINES_VERBOSE': '1'}
     api.python("gclient runhooks wrapper",
-               api.infra_paths['build'].join("scripts", "slave",
+               api.path["build"].join("scripts", "slave",
                                       "runhooks_wrapper.py"),
                env=env)
     # cleanup_temp step
     api.chromium.cleanup_temp()
     # compile.py step
     args = ['--target', 'Release', '--clobber', '--build-tool=ninja',
             '--compiler=goma-clang', '--', 'chromium_builder_nacl_sdk']
     api.python("compile",
-               api.infra_paths['build'].join("scripts", "slave", "compile.py"),
+               api.path["build"].join("scripts", "slave", "compile.py"),
                args=args)
     # annotated_steps step
     api.python(
         "annotated_steps",
-        api.infra_paths['build'].join("scripts", "slave", "chromium",
+        api.path["build"].join("scripts", "slave", "chromium",
                                "nacl_sdk_buildbot_run.py"),
         args=
         ['--build-properties=%s' % api.json.dumps(build_properties,
                                                   separators=(',', ':')),
          '--factory-properties={"annotated_script":"nacl_sdk_buildbot_run.py"'+\
              ',"blink_config":"chromium","gclient_env":'+\
              '{"CHROMIUM_GYP_SYNTAX_CHECK":"1","DEPOT_TOOLS_UPDATE":"0",'+\
              '"GYP_DEFINES":"fastbuild=1 component=static_library",'+\
              '"GYP_GENERATORS":"ninja","LANDMINES_VERBOSE":"1"},'+\
              '"no_gclient_branch":true,"nuke_and_pave":false}'
          ],
         allow_subannotations=True)
 
 
 def windows_sdk_multi_steps(api):
     build_properties = api.properties.legacy()
     # svnkill step; not necessary in recipes
     # update scripts step; implicitly run by recipe engine.
     # taskkill step
-    api.python("taskkill", api.infra_paths['build'].join("scripts", "slave",
+    api.python("taskkill", api.path["build"].join("scripts", "slave",
                                                   "kill_processes.py"))
     # bot_update step
     src_cfg = api.gclient.make_config(GIT_MODE=True)
     soln = src_cfg.solutions.add()
     soln.name = "src"
     soln.url = "https://chromium.googlesource.com/chromium/src.git"
     soln.custom_deps = {'src/third_party/WebKit/LayoutTests': None}
     soln.custom_vars = {'webkit_trunk': 'svn://svn.chromium.org/blink/trunk',
                         'googlecode_url': 'svn://svn.chromium.org/%s',
                         'nacl_trunk':
@@ skipping 33 matching lines @@
     result = api.bot_update.ensure_checkout(force=True)
     build_properties.update(result.json.output.get("properties", {}))
     # gclient revert step; made unnecessary by bot_update
     # gclient update step; made unnecessary by bot_update
     # gclient runhooks wrapper step
     env = {'CHROMIUM_GYP_SYNTAX_CHECK': '1',
            'LANDMINES_VERBOSE': '1',
            'DEPOT_TOOLS_UPDATE': '0',
            'GYP_DEFINES': 'fastbuild=1 component=static_library'}
     api.python("gclient runhooks wrapper",
-               api.infra_paths['build'].join("scripts", "slave",
+               api.path["build"].join("scripts", "slave",
                                       "runhooks_wrapper.py"),
                env=env)
     # cleanup_temp step
     api.chromium.cleanup_temp()
     # compile.py step
     args = ['--solution', 'all.sln', '--project', 'chromium_builder_nacl_sdk',
             '--target', 'Release', '--clobber', '--compiler=goma']
     api.python("compile",
-               api.infra_paths['build'].join("scripts", "slave", "compile.py"),
+               api.path["build"].join("scripts", "slave", "compile.py"),
                args=args)
     # annotated_steps step
     api.python(
         "annotated_steps",
-        api.infra_paths['build'].join("scripts", "slave", "chromium",
+        api.path["build"].join("scripts", "slave", "chromium",
                                "nacl_sdk_buildbot_run.py"),
         args=
         ['--build-properties=%s' % api.json.dumps(build_properties,
                                                   separators=(',', ':')),
          '--factory-properties={"annotated_script":"nacl_sdk_buildbot_run.py"'+\
              ',"blink_config":"chromium","gclient_env":'+\
              '{"CHROMIUM_GYP_SYNTAX_CHECK":"1","DEPOT_TOOLS_UPDATE":"0",'+\
              '"GYP_DEFINES":"fastbuild=1 component=static_library",'+\
              '"LANDMINES_VERBOSE":"1"},"no_gclient_branch":true,'+\
              '"nuke_and_pave":false}'
@@ skipping 23 matching lines @@
     api.gclient.c = src_cfg
     result = api.bot_update.ensure_checkout(force=True)
     build_properties.update(result.json.output.get("properties", {}))
     # unnamed step; null converted
     # gclient runhooks wrapper step
     env = {'CHROMIUM_GYP_SYNTAX_CHECK': '1',
            'LANDMINES_VERBOSE': '1',
            'DEPOT_TOOLS_UPDATE': '0',
            'GYP_DEFINES': 'fastbuild=1 component=static_library'}
     api.python("gclient runhooks wrapper",
-               api.infra_paths['build'].join("scripts", "slave",
+               api.path["build"].join("scripts", "slave",
                                       "runhooks_wrapper.py"),
                env=env)
     # cleanup_temp step
     api.chromium.cleanup_temp()
     # compile.py step
     args = ['--target', 'Release', '--clobber', '--compiler=goma',
             'chromium_builder_tests']
     api.python("compile",
-               api.infra_paths['build'].join("scripts", "slave", "compile.py"),
+               api.path["build"].join("scripts", "slave", "compile.py"),
                args=args)
     # annotated_steps step
     api.python(
         "annotated_steps",
-        api.infra_paths['build'].join("scripts", "slave", "chromium",
+        api.path["build"].join("scripts", "slave", "chromium",
                                "nacl_sdk_buildbot_run.py"),
         args=
         ['--build-properties=%s' % api.json.dumps(build_properties,
                                                   separators=(',', ':')),
          '--factory-properties={"annotated_script":"nacl_sdk_buildbot_run.py"'+\
              ',"blink_config":"chromium","gclient_env":'+\
              '{"CHROMIUM_GYP_SYNTAX_CHECK":"1","DEPOT_TOOLS_UPDATE":"0",'+\
              '"GYP_DEFINES":"fastbuild=1 component=static_library",'+\
              '"LANDMINES_VERBOSE":"1"},"no_gclient_branch":true,'+\
              '"nuke_and_pave":true}'
          ],
         allow_subannotations=True)
 
 
 def windows_sdk_multirel_steps(api):
     build_properties = api.properties.legacy()
     # svnkill step; not necessary in recipes
     # update scripts step; implicitly run by recipe engine.
     # taskkill step
-    api.python("taskkill", api.infra_paths['build'].join("scripts", "slave",
+    api.python("taskkill", api.path["build"].join("scripts", "slave",
                                                   "kill_processes.py"))
     # bot_update step
     src_cfg = api.gclient.make_config(GIT_MODE=True)
     soln = src_cfg.solutions.add()
     soln.name = "chrome-official"
     soln.url = "svn://svn.chromium.org/chrome-internal/trunk/tools/buildspec/"+\
         "build/chrome-official"
     soln.custom_deps = {'src-pdf': None, 'src/pdf': None}
     soln.custom_vars = {'webkit_trunk': 'svn://svn.chromium.org/blink/trunk',
                         'googlecode_url': 'svn://svn.chromium.org/%s',
                         'sourceforge_url': 'svn://svn.chromium.org/%(repo)s',
                         'svn_url': 'svn://svn.chromium.org'}
     src_cfg.got_revision_mapping.update(
         {'src': 'got_revision',
          'src/third_party/WebKit': 'got_webkit_revision',
          'src/tools/swarming_client': 'got_swarming_client_revision',
          'src/v8': 'got_v8_revision'})
     api.gclient.c = src_cfg
     result = api.bot_update.ensure_checkout(force=True)
     build_properties.update(result.json.output.get("properties", {}))
     # unnamed step; null converted
     # gclient runhooks wrapper step
     env = {'CHROMIUM_GYP_SYNTAX_CHECK': '1',
            'LANDMINES_VERBOSE': '1',
            'DEPOT_TOOLS_UPDATE': '0',
            'GYP_DEFINES': 'fastbuild=1 component=static_library'}
     api.python("gclient runhooks wrapper",
-               api.infra_paths['build'].join("scripts", "slave",
+               api.path["build"].join("scripts", "slave",
                                       "runhooks_wrapper.py"),
                env=env)
     # cleanup_temp step
     api.chromium.cleanup_temp()
     # compile.py step
     args = ['--solution', 'all.sln', '--project', 'chromium_builder_tests',
             '--target', 'Release', '--clobber', '--compiler=goma']
     api.python("compile",
-               api.infra_paths['build'].join("scripts", "slave", "compile.py"),
+               api.path["build"].join("scripts", "slave", "compile.py"),
                args=args)
     # annotated_steps step
     api.python(
         "annotated_steps",
-        api.infra_paths['build'].join("scripts", "slave", "chromium",
+        api.path["build"].join("scripts", "slave", "chromium",
                                "nacl_sdk_buildbot_run.py"),
         args=
         ['--build-properties=%s' % api.json.dumps(build_properties,
                                                   separators=(',', ':')),
          '--factory-properties={"annotated_script":"nacl_sdk_buildbot_run.py"'+\
              ',"blink_config":"chromium","gclient_env":'+\
              '{"CHROMIUM_GYP_SYNTAX_CHECK":"1","DEPOT_TOOLS_UPDATE":"0",'+\
              '"GYP_DEFINES":"fastbuild=1 component=static_library",'+\
              '"LANDMINES_VERBOSE":"1"},"no_gclient_branch":true,'+\
              '"nuke_and_pave":true}'
@@ skipping 24 matching lines @@
     result = api.bot_update.ensure_checkout(force=True)
     build_properties.update(result.json.output.get("properties", {}))
     # unnamed step; null converted
     # gclient runhooks wrapper step
     env = {'LANDMINES_VERBOSE': '1',
            'GYP_GENERATORS': 'ninja',
            'DEPOT_TOOLS_UPDATE': '0',
            'GYP_DEFINES': 'fastbuild=1 component=static_library',
            'CHROMIUM_GYP_SYNTAX_CHECK': '1'}
     api.python("gclient runhooks wrapper",
-               api.infra_paths['build'].join("scripts", "slave",
+               api.path["build"].join("scripts", "slave",
                                       "runhooks_wrapper.py"),
                env=env)
     # cleanup_temp step
     api.chromium.cleanup_temp()
     # compile.py step
     args = ['--target', 'Release', '--clobber', '--build-tool=ninja',
             '--compiler=goma-clang', '--', 'chromium_builder_tests']
     api.python("compile",
-               api.infra_paths['build'].join("scripts", "slave", "compile.py"),
+               api.path["build"].join("scripts", "slave", "compile.py"),
                args=args)
     # annotated_steps step
     api.python(
         "annotated_steps",
-        api.infra_paths['build'].join("scripts", "slave", "chromium",
+        api.path["build"].join("scripts", "slave", "chromium",
                                "nacl_sdk_buildbot_run.py"),
         args=
         ['--build-properties=%s' % api.json.dumps(build_properties,
                                                   separators=(',', ':')),
          '--factory-properties={"annotated_script":"nacl_sdk_buildbot_run.py"'+\
              ',"blink_config":"chromium","gclient_env":'+\
              '{"CHROMIUM_GYP_SYNTAX_CHECK":"1","DEPOT_TOOLS_UPDATE":"0",'+\
              '"GYP_DEFINES":"fastbuild=1 component=static_library",'+\
              '"GYP_GENERATORS":"ninja","LANDMINES_VERBOSE":"1"},'+\
              '"no_gclient_branch":true,"nuke_and_pave":true}'
@@ skipping 59 matching lines @@
     yield (api.test('mac_sdk_multirel') + api.properties(
         mastername='client.nacl.sdk') + api.properties(
             buildername='mac-sdk-multirel') +
            api.properties(revision='123456789abcdef') + api.properties(
                got_revision='123456789abcdef') + api.properties(
                    buildnumber='42') + api.properties(slavename='TestSlave'))
     yield (api.test('builder_not_in_dispatch_directory') + api.properties(
         mastername='client.nacl.sdk') + api.properties(
             buildername='nonexistent_builder') + api.properties(
                 slavename='TestSlave'))