| 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 4d2fff0a88ede41f80fcf34868231d8302029210..8ee531a3e2cdbe43eae41c2e9e2468321a322116 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
|
|
|