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

Unified Diff: build/android/provision_devices.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/host_heartbeat.py ('k') | build/android/pylib/device/adb_wrapper.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/android/provision_devices.py
diff --git a/build/android/provision_devices.py b/build/android/provision_devices.py
index e4517b606a7524ad8cf4e0146a0f280e25fa8a08..33f8bf47a75161b91ace09cbce9a48a717bb6362 100755
--- a/build/android/provision_devices.py
+++ b/build/android/provision_devices.py
@@ -19,13 +19,12 @@
import sys
import time
+from pylib import android_commands
from pylib import constants
from pylib import device_settings
-from pylib.device import adb_wrapper
from pylib.device import battery_utils
from pylib.device import device_blacklist
from pylib.device import device_errors
-from pylib.device import device_filter
from pylib.device import device_utils
from pylib.utils import run_tests_helper
from pylib.utils import timeout_retry
@@ -55,8 +54,7 @@
if options.device is not None:
devices = [options.device]
else:
- devices = adb_wrapper.AdbWrapper.Devices(
- filters=device_filter.DefaultFilters())
+ devices = android_commands.GetAttachedDevices()
parallel_devices = device_utils.DeviceUtils.parallel(devices)
parallel_devices.pMap(ProvisionDevice, options)
@@ -198,8 +196,7 @@
'ro.setupwizard.mode=DISABLED',
]
if java_debug:
- local_props.append(
- '%s=all' % device_utils.DeviceUtils.JAVA_ASSERT_PROPERTY)
+ local_props.append('%s=all' % android_commands.JAVA_ASSERT_PROPERTY)
local_props.append('debug.checkjni=1')
try:
device.WriteFile(
« no previous file with comments | « build/android/host_heartbeat.py ('k') | build/android/pylib/device/adb_wrapper.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698