Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(230)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: build/android/devil/android/sdk/adb_wrapper.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
« build/android/devil/android/sdk/__init__.py ('K') | « build/android/devil/android/sdk/aapt.py ('k') | build/android/devil/android/sdk/adb_wrapper_test.py » ('j') | build/android/devil/bot/__init__.py » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/android/devil/android/sdk/adb_wrapper.py
diff --git a/build/android/pylib/device/adb_wrapper.py b/build/android/devil/android/sdk/adb_wrapper.py
similarity index 99%
copy from build/android/pylib/device/adb_wrapper.py
copy to build/android/devil/android/sdk/adb_wrapper.py
index 5581e0a3a0c4cdc9bc073825734160ce8645f9e7..7463969c54dbefa4e88fd5401cb91fc86495f5e5 100644
--- a/build/android/pylib/device/adb_wrapper.py
+++ b/build/android/devil/android/sdk/adb_wrapper.py
@@ -14,11 +14,11 @@ import logging
import os
import re
-from pylib import cmd_helper
+from devil.android import decorators
+from devil.android import device_errors
+from devil.utils import cmd_helper
+from devil.utils import timeout_retry
from pylib import constants
-from pylib.device import decorators
-from pylib.device import device_errors
-from pylib.utils import timeout_retry
_DEFAULT_TIMEOUT = 30
« build/android/devil/android/sdk/__init__.py ('K') | « build/android/devil/android/sdk/aapt.py ('k') | build/android/devil/android/sdk/adb_wrapper_test.py » ('j') | build/android/devil/bot/__init__.py » ('J')

Powered by Google App Engine
This is Rietveld 408576698