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

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

Issue 754433003: Update from https://crrev.com/305340 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: 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 | « build/android/provision_devices.py ('k') | build/android/pylib/base/base_setup.py » ('j') | no next file with comments »
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 6981afcc9afd25710e3abea0b590b564d6b95147..8d7866dc9362bcc86b7d607f3e3923c4ee80900e 100644
--- a/build/android/pylib/android_commands.py
+++ b/build/android/pylib/android_commands.py
@@ -6,7 +6,7 @@
Assumes adb binary is currently on system path.
"""
-# pylint: disable-all
+# pylint: skip-file
import collections
import datetime
@@ -314,11 +314,7 @@ 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 = adb_interface.AdbInterface(constants.GetAdbPath())
if device:
self._adb.SetTargetSerial(device)
self._device = device
« no previous file with comments | « build/android/provision_devices.py ('k') | build/android/pylib/base/base_setup.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698