scripts/slave/recipe_modules/adb/api.py - Issue 1917243002: Revert "build: roll infra_paths changes"

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: scripts/slave/recipe_modules/adb/api.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:

Index: scripts/slave/recipe_modules/adb/api.py

diff --git a/scripts/slave/recipe_modules/adb/api.py b/scripts/slave/recipe_modules/adb/api.py

index a47b7f58b7fda5d2b3e663534c54bc15ebecd690..bfefdb2e7c231d006ebce91c8fcfcddd07f8690c 100644

--- a/scripts/slave/recipe_modules/adb/api.py

+++ b/scripts/slave/recipe_modules/adb/api.py

@@ -23,7 +23,7 @@ class AdbApi(recipe_api.RecipeApi):

def adb_path(self):

if self._custom_adb_path:

return self._custom_adb_path

- return self.m.infra_paths['slave_build'].join(

+ return self.m.path['slave_build'].join(

'src', 'third_party', 'android_tools', 'sdk', 'platform-tools', 'adb')

def adb_dir(self):