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

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

Issue 1390613002: Revert of [Android] Add a configurable environment for devil/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 2 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/devil/android/sdk/aapt.py ('k') | build/android/devil/android/sdk/dexdump.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 63ccc83c8aa3f9cfbb13df9d4c92f5349e57a354..5a81c7fe503b634f583e29d40f92bd6515948bf8 100644
--- a/build/android/devil/android/sdk/adb_wrapper.py
+++ b/build/android/devil/android/sdk/adb_wrapper.py
@@ -14,11 +14,11 @@
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 @@
cmd = ['taskset', '-c', str(cpu_affinity)]
else:
cmd = []
- cmd.append(devil_env.config.adb_path)
+ cmd.append(constants.GetAdbPath())
if device_serial is not None:
cmd.extend(['-s', device_serial])
cmd.extend(args)
« no previous file with comments | « build/android/devil/android/sdk/aapt.py ('k') | build/android/devil/android/sdk/dexdump.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698