build/android/devil/android/sdk/adb_wrapper.py - Issue 1583053002: [Android] Port chromium+devil to catapult+dependency_manager

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: build/android/devil/android/sdk/adb_wrapper.py

Issue 1583053002: [Android] Port chromium+devil to catapult+dependency_manager (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 11 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: build/android/devil/android/sdk/adb_wrapper.py

diff --git a/build/android/devil/android/sdk/adb_wrapper.py b/build/android/devil/android/sdk/adb_wrapper.py

index 17288c203873e9752581a2835a88accbe5a27de5..30a8feed5e55349dc3a0dc997ed4b2edf37630d3 100644

--- a/build/android/devil/android/sdk/adb_wrapper.py

+++ b/build/android/devil/android/sdk/adb_wrapper.py

@@ -21,8 +21,8 @@ from devil.utils import cmd_helper

from devil.utils import lazy

from devil.utils import timeout_retry

-with devil_env.SysPath(devil_env.CATAPULT_BASE_PATH):

- from catapult_base import dependency_manager # pylint: disable=import-error

+with devil_env.SysPath(devil_env.DEPENDENCY_MANAGER_PATH):

+ import dependency_manager # pylint: disable=import-error

_DEFAULT_TIMEOUT = 30

« no previous file with comments | « no previous file | build/android/devil/android/sdk/build_tools.py » ('j') | no next file with comments »