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

Unified Diff: tools/telemetry/telemetry/android_browser_finder.py

Issue 11830011: [Telemetry] Put adb on the path if it is not already there. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Use absolute path Created 7 years, 11 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/telemetry/telemetry/android_browser_finder.py
diff --git a/tools/telemetry/telemetry/android_browser_finder.py b/tools/telemetry/telemetry/android_browser_finder.py
index f10bd96829fa706cde5b58e87ca910f8abd925a0..cf0e519a664af7d4d975ac3bae1223c356f39438 100644
--- a/tools/telemetry/telemetry/android_browser_finder.py
+++ b/tools/telemetry/telemetry/android_browser_finder.py
@@ -7,6 +7,7 @@ import os
import logging as real_logging
import re
import subprocess
+import sys
from telemetry import adb_commands
from telemetry import android_browser_backend
@@ -80,9 +81,15 @@ def FindAllAvailableBrowsers(options, logging=real_logging):
logging.warn(' adb kill-server')
logging.warn(' sudo `which adb` devices\n\n')
except OSError:
- logging.info('No adb command found. ' +
- 'Will not try searching for Android browsers.')
- return []
+ if sys.platform.startswith('linux'):
+ os.environ['PATH'] = os.pathsep.join([
+ os.path.join(os.path.dirname(__file__),
+ '../../../third_party/android_tools/sdk/platform-tools'),
+ os.environ['PATH']])
+ else:
+ logging.info('No adb command found. ' +
+ 'Will not try searching for Android browsers.')
+ return []
device = None
if options.android_device:
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698