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

Unified Diff: build/android/devil/android/sdk/split_select.py

Issue 1314913009: [Android] Move some pylib modules into devil/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase 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/sdk/shared_prefs_test.py ('k') | build/android/devil/base_error.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/android/devil/android/sdk/split_select.py
diff --git a/build/android/pylib/sdk/split_select.py b/build/android/devil/android/sdk/split_select.py
similarity index 92%
copy from build/android/pylib/sdk/split_select.py
copy to build/android/devil/android/sdk/split_select.py
index e20466214239d9ca4c3819ad3d02d10eebc72e44..d468fd4aeeb8f0b5273277ac81b380e041f7e3ed 100644
--- a/build/android/pylib/sdk/split_select.py
+++ b/build/android/devil/android/sdk/split_select.py
@@ -6,9 +6,9 @@
import os
-from pylib import cmd_helper
+from devil.utils import cmd_helper
+from devil.utils import timeout_retry
from pylib import constants
-from pylib.utils import timeout_retry
_SPLIT_SELECT_PATH = os.path.join(constants.ANDROID_SDK_TOOLS, 'split-select')
@@ -55,4 +55,4 @@ def SelectSplits(device, base_apk, split_apks):
args = ['--target', config, '--base', base_apk]
for split in split_apks:
args.extend(['--split', split])
- return _RunSplitSelectCmd(args).splitlines()
+ return _RunSplitSelectCmd(args).splitlines()
« no previous file with comments | « build/android/devil/android/sdk/shared_prefs_test.py ('k') | build/android/devil/base_error.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698