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

Unified Diff: build/android/pylib/android_commands.py

Issue 711113002: Add option to specify ADB binary in test runner. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Decided to move where ADB added to path to test_runner.py Created 6 years, 1 month 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 | « no previous file | build/android/pylib/constants.py » ('j') | build/android/pylib/constants.py » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/android/pylib/android_commands.py
diff --git a/build/android/pylib/android_commands.py b/build/android/pylib/android_commands.py
index ea86e6d90176beddca6f2f5c7217635793a09f72..1a437823ddcfc051e6e3c5b73142423068159953 100644
--- a/build/android/pylib/android_commands.py
+++ b/build/android/pylib/android_commands.py
@@ -314,11 +314,8 @@ class AndroidCommands(object):
device: If given, adb commands are only send to the device of this ID.
Otherwise commands are sent to all attached devices.
"""
- adb_dir = os.path.dirname(constants.GetAdbPath())
- if adb_dir and adb_dir not in os.environ['PATH'].split(os.pathsep):
- # Required by third_party/android_testrunner to call directly 'adb'.
- os.environ['PATH'] += os.pathsep + adb_dir
self._adb = adb_interface.AdbInterface()
+ self._adb.SetAdbPath(constants.GetAdbPath())
jbudorick 2014/11/11 18:04:03 Add the adb path as a parameter to AdbInterface.__
mikecase (-- gone --) 2014/11/11 19:36:01 Done.
if device:
self._adb.SetTargetSerial(device)
self._device = device
« no previous file with comments | « no previous file | build/android/pylib/constants.py » ('j') | build/android/pylib/constants.py » ('J')

Powered by Google App Engine
This is Rietveld 408576698