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

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

Issue 11820035: [Telemetry] Only add android_tools' adb to the path if it exists. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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 cf0e519a664af7d4d975ac3bae1223c356f39438..dc3115edc78b701817449dba0c23e5339862a23b 100644
--- a/tools/telemetry/telemetry/android_browser_finder.py
+++ b/tools/telemetry/telemetry/android_browser_finder.py
@@ -81,11 +81,13 @@ def FindAllAvailableBrowsers(options, logging=real_logging):
logging.warn(' adb kill-server')
logging.warn(' sudo `which adb` devices\n\n')
except OSError:
- 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']])
+ platform_tools_path = os.path.join(
+ os.path.dirname(__file__), '..', '..', '..',
+ 'third_party', 'android_tools', 'sdk', 'platform-tools')
+ if (sys.platform.startswith('linux') and
+ os.path.exists(os.path.join(platform_tools_path, 'adb'))):
+ os.environ['PATH'] = os.pathsep.join([platform_tools_path,
+ os.environ['PATH']])
else:
logging.info('No adb command found. ' +
'Will not try searching for Android browsers.')
« 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