diff options
| author | jbudorick <jbudorick@chromium.org> | 2015-04-15 11:24:51 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-04-15 18:25:13 +0000 |
| commit | 61b860c0b5bf89c0647ea488cf787c79924bd703 (patch) | |
| tree | 62d520e2f2bf61128f1a3b61aa9269f211290cf8 /build/android/screenshot.py | |
| parent | 79c734ba9f56df8670dcf75b0acb7e2e415c7126 (diff) | |
| download | chromium_src-61b860c0b5bf89c0647ea488cf787c79924bd703.zip chromium_src-61b860c0b5bf89c0647ea488cf787c79924bd703.tar.gz chromium_src-61b860c0b5bf89c0647ea488cf787c79924bd703.tar.bz2 | |
Revert of [Android] Remove android_commands uses from build/android/. (patchset #4 id:60001 of https://codereview.chromium.org/1088793002/)
Reason for revert:
Broken for AdbWrapper.Devices(filters=None)
Original issue's description:
> [Android] Remove android_commands uses from build/android/.
>
> This also adds filtering to AdbWrapper.GetDevices().
>
> BUG=267773
>
> Committed: https://crrev.com/55d1762e76ebe2494c882594c620993419d97b98
> Cr-Commit-Position: refs/heads/master@{#325254}
TBR=perezju@chromium.org,klundberg@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=267773
Review URL: https://codereview.chromium.org/1089273002
Cr-Commit-Position: refs/heads/master@{#325276}
Diffstat (limited to 'build/android/screenshot.py')
| -rwxr-xr-x | build/android/screenshot.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/build/android/screenshot.py b/build/android/screenshot.py index 4c1e247..8fe2a95 100755 --- a/build/android/screenshot.py +++ b/build/android/screenshot.py @@ -11,9 +11,8 @@ 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'): @@ -70,8 +69,7 @@ def main(): if options.verbose: logging.getLogger().setLevel(logging.DEBUG) - devices = adb_wrapper.AdbWrapper.Devices( - filters=device_filter.DefaultFilters()) + devices = android_commands.GetAttachedDevices() if not options.device and len(devices) > 1: parser.error('Multiple devices are attached. ' |