build/android/pylib/local/device/local_device_environment.py - Issue 1314313004: [Android][telemetry] Update pylib imports for modules that moved into devil.

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/pylib/local/device/local_device_environment.py

Issue 1314313004: [Android][telemetry] Update pylib imports for modules that moved into devil. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 3 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

« no previous file with comments | « build/android/pylib/linker/test_runner.py ('k') | build/android/pylib/local/device/local_device_instrumentation_test_run.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: build/android/pylib/local/device/local_device_environment.py

diff --git a/build/android/pylib/local/device/local_device_environment.py b/build/android/pylib/local/device/local_device_environment.py

index 4a0d5672173da57826b3d9d8ed36befe13d9defa..7a20903998b977d5aba1b30c2acfbd7ab71bf5ca 100644

--- a/build/android/pylib/local/device/local_device_environment.py

+++ b/build/android/pylib/local/device/local_device_environment.py

@@ -2,12 +2,12 @@

# Use of this source code is governed by a BSD-style license that can be

# found in the LICENSE file.

+from devil.android import device_blacklist

+from devil.android import device_errors

+from devil.android import device_utils

+from devil.android.sdk import adb_wrapper

+from devil.utils import parallelizer

from pylib.base import environment

-from pylib.device import adb_wrapper

-from pylib.device import device_blacklist

-from pylib.device import device_errors

-from pylib.device import device_utils

-from pylib.utils import parallelizer

class LocalDeviceEnvironment(environment.Environment):