summaryrefslogtreecommitdiffstats
path: root/build/android/screenshot.py
diff options
context:
space:
mode:
authorjbudorick <jbudorick@chromium.org>2015-04-16 07:10:02 -0700
committerCommit bot <commit-bot@chromium.org>2015-04-16 14:10:16 +0000
commitbfffb22e47e9c20bc2a7019d47f7e986a63f42f5 (patch)
tree6f84bbf9856b5766b734cab7dfa471ee0d9ded58 /build/android/screenshot.py
parent70057a8dd96d0dddcabcba27982e2e5bd60e4355 (diff)
downloadchromium_src-bfffb22e47e9c20bc2a7019d47f7e986a63f42f5.zip
chromium_src-bfffb22e47e9c20bc2a7019d47f7e986a63f42f5.tar.gz
chromium_src-bfffb22e47e9c20bc2a7019d47f7e986a63f42f5.tar.bz2
[Android] Remove android_commands uses from build/android/. (reland)
original CL: https://codereview.chromium.org/1088793002/ BUG=267773 Review URL: https://codereview.chromium.org/1083403002 Cr-Commit-Position: refs/heads/master@{#325439}
Diffstat (limited to 'build/android/screenshot.py')
-rwxr-xr-xbuild/android/screenshot.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/build/android/screenshot.py b/build/android/screenshot.py
index 8fe2a95..4c1e247 100755
--- a/build/android/screenshot.py
+++ b/build/android/screenshot.py
@@ -11,8 +11,9 @@ import optparse
import os
import sys
-from pylib import android_commands
from pylib import screenshot
+from pylib.device import adb_wrapper
+from pylib.device import device_filter
from pylib.device import device_utils
def _PrintMessage(heading, eol='\n'):
@@ -69,7 +70,8 @@ def main():
if options.verbose:
logging.getLogger().setLevel(logging.DEBUG)
- devices = android_commands.GetAttachedDevices()
+ devices = adb_wrapper.AdbWrapper.Devices(
+ filters=device_filter.DefaultFilters())
if not options.device and len(devices) > 1:
parser.error('Multiple devices are attached. '