build/android/pylib/instrumentation/setup.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/instrumentation/setup.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/instrumentation/instrumentation_test_instance.py ('k') | build/android/pylib/instrumentation/test_jar.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: build/android/pylib/instrumentation/setup.py

diff --git a/build/android/pylib/instrumentation/setup.py b/build/android/pylib/instrumentation/setup.py

index aacb6b33380e8103a797520f6c885e1c14ba0988..7acfb6266a4574374d0844b89414991c6bdbc131 100644

--- a/build/android/pylib/instrumentation/setup.py

+++ b/build/android/pylib/instrumentation/setup.py

@@ -7,11 +7,10 @@

import logging

import os

+from devil.android import device_utils

from pylib import constants

from pylib import valgrind_tools

from pylib.base import base_setup

-from pylib.device import device_utils

from pylib.instrumentation import test_package

from pylib.instrumentation import test_runner