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

Unified Diff: build/android/screenshot.py

Issue 1089273002: Revert of [Android] Remove android_commands uses from build/android/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 8 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/pylib/local/device/local_device_environment.py ('k') | build/android/tombstones.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/android/screenshot.py
diff --git a/build/android/screenshot.py b/build/android/screenshot.py
index 4c1e247fcef09423c4b183458e005807b07482de..8fe2a95ddd9948e783f7c0831abf4deb421fea91 100755
--- a/build/android/screenshot.py
+++ b/build/android/screenshot.py
@@ -11,9 +11,8 @@
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 @@
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. '
« no previous file with comments | « build/android/pylib/local/device/local_device_environment.py ('k') | build/android/tombstones.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698