Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(80)

Unified Diff: scripts/slave/recipes/flutter/flutter.py

Issue 1917243002: Revert "build: roll infra_paths changes" (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master
Patch Set: Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: scripts/slave/recipes/flutter/flutter.py
diff --git a/scripts/slave/recipes/flutter/flutter.py b/scripts/slave/recipes/flutter/flutter.py
index b96f360bb019b103f9456f9984676442a4f21f2f..eb81da5abcc3ed87124a68e5463d0eb8a49a7a26 100644
--- a/scripts/slave/recipes/flutter/flutter.py
+++ b/scripts/slave/recipes/flutter/flutter.py
@@ -6,7 +6,6 @@ import contextlib
DEPS = [
'depot_tools/git',
- 'depot_tools/infra_paths',
'file',
'gsutil',
'recipe_engine/json',
@@ -151,7 +150,7 @@ def RunFindXcode(api, step_name, target_version=None):
if target_version is not None:
args.extend(['--version', target_version])
- result = api.python(step_name, api.infra_paths['build'].join('scripts', 'slave',
+ result = api.python(step_name, api.path['build'].join('scripts', 'slave',
'ios', 'find_xcode.py'), args)
return result.json.output
@@ -174,7 +173,7 @@ def SetupXcode(api):
def RunSteps(api):
# buildbot sets 'clobber' to the empty string which is falsey, check with 'in'
if 'clobber' in api.properties:
- api.file.rmcontents('everything', api.infra_paths['slave_build'])
+ api.file.rmcontents('everything', api.path['slave_build'])
git_hash = api.git.checkout(
'https://chromium.googlesource.com/external/github.com/flutter/flutter',
@@ -189,7 +188,7 @@ def RunSteps(api):
# TODO(eseidel): This is named exactly '.pub-cache' as a hack around
# a regexp in flutter_tools analyze.dart which is in turn a hack around:
# https://github.com/dart-lang/sdk/issues/25722
- pub_cache = api.infra_paths['slave_build'].join('.pub-cache')
+ pub_cache = api.path['slave_build'].join('.pub-cache')
env = {
'PATH': api.path.pathsep.join((str(flutter_bin), str(dart_bin),
'%(PATH)s')),
« no previous file with comments | « scripts/slave/recipes/flutter/engine.expected/mac.json ('k') | scripts/slave/recipes/flutter/flutter.expected/linux.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698