build/android/devil/android/device_utils.py - Issue 1314913009: [Android] Move some pylib modules 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/devil/android/device_utils.py

Issue 1314913009: [Android] Move some pylib modules into devil/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: TELEMETRY_DEPS Created 5 years, 4 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/devil/android/device_temp_file_test.py ('k') | build/android/devil/android/device_utils_device_test.py » ('j') | build/android/devil/android/sdk/__init__.py » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: build/android/devil/android/device_utils.py

diff --git a/build/android/pylib/device/device_utils.py b/build/android/devil/android/device_utils.py

similarity index 99%

copy from build/android/pylib/device/device_utils.py

copy to build/android/devil/android/device_utils.py

index 593432f899dde9de0d6d887074f575b3e8f537e5..24c5854e7dce39666d4ef0fe1e0c7d71e6fb7c67 100644

--- a/build/android/pylib/device/device_utils.py

+++ b/build/android/devil/android/device_utils.py

@@ -23,26 +23,26 @@ import threading

import time

import zipfile

-from pylib import cmd_helper

+from devil import base_error

+from devil.utils import cmd_helper

+from devil.android import apk_helper

+from devil.android import device_signal

+from devil.android import decorators

+from devil.android import device_blacklist

+from devil.android import device_errors

+from devil.android import device_temp_file

+from devil.android import logcat_monitor

+from devil.android import md5sum

+from devil.android.sdk import adb_wrapper

+from devil.android.sdk import intent

+from devil.android.sdk import keyevent

+from devil.android.sdk import split_select

+from devil.utils import host_utils

+from devil.utils import parallelizer

+from devil.utils import timeout_retry

+from devil.utils import zip_utils

from pylib import constants

-from pylib import device_signal

-from pylib.constants import keyevent

-from pylib.device import adb_wrapper

-from pylib.device import decorators

-from pylib.device import device_blacklist

-from pylib.device import device_errors

-from pylib.device import intent

-from pylib.device import logcat_monitor

from pylib.device.commands import install_commands

-from pylib.sdk import split_select

-from pylib.utils import apk_helper

-from pylib.utils import base_error

-from pylib.utils import device_temp_file

-from pylib.utils import host_utils

-from pylib.utils import md5sum

-from pylib.utils import parallelizer

-from pylib.utils import timeout_retry

-from pylib.utils import zip_utils

_DEFAULT_TIMEOUT = 30

_DEFAULT_RETRIES = 3