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

Unified Diff: build/android/devil/android/sdk/adb_wrapper.py

Issue 1316413003: [Android] Add a configurable environment for devil/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 3 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
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 b6ec4e826385569bb166954d8711743996c54e9a..d91e263a6cbb0fa532cad55e041bed968cea57c8 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 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(env.android_sdk.adb_path)
if device_serial is not None:
cmd.extend(['-s', device_serial])
cmd.extend(args)

Powered by Google App Engine
This is Rietveld 408576698