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.') |