| Index: build/android/devil/android/sdk/adb_wrapper.py
|
| diff --git a/build/android/devil/android/sdk/adb_wrapper.py b/build/android/devil/android/sdk/adb_wrapper.py
|
| index 5a81c7fe503b634f583e29d40f92bd6515948bf8..63ccc83c8aa3f9cfbb13df9d4c92f5349e57a354 100644
|
| --- a/build/android/devil/android/sdk/adb_wrapper.py
|
| +++ b/build/android/devil/android/sdk/adb_wrapper.py
|
| @@ -14,11 +14,11 @@ import logging
|
| import os
|
| import re
|
|
|
| +from devil import devil_env
|
| from devil.android import decorators
|
| from devil.android import device_errors
|
| from devil.utils import cmd_helper
|
| from devil.utils import timeout_retry
|
| -from pylib import constants
|
|
|
|
|
| _DEFAULT_TIMEOUT = 30
|
| @@ -66,7 +66,7 @@ class AdbWrapper(object):
|
| cmd = ['taskset', '-c', str(cpu_affinity)]
|
| else:
|
| cmd = []
|
| - cmd.append(constants.GetAdbPath())
|
| + cmd.append(devil_env.config.adb_path)
|
| if device_serial is not None:
|
| cmd.extend(['-s', device_serial])
|
| cmd.extend(args)
|
|
|