tools/telemetry/telemetry/core/backends/chrome/android_browser_finder.py - Issue 294663015: [Telemetry] Make Android work with a mac host.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: tools/telemetry/telemetry/core/backends/chrome/android_browser_finder.py

Issue 294663015: [Telemetry] Make Android work with a mac host. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 7 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 | « tools/telemetry/telemetry/core/backends/adb_commands.py ('k') | tools/telemetry/telemetry/core/forwarders/android_forwarder.py » ('j') | tools/telemetry/telemetry/core/forwarders/android_forwarder.py » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: tools/telemetry/telemetry/core/backends/chrome/android_browser_finder.py

diff --git a/tools/telemetry/telemetry/core/backends/chrome/android_browser_finder.py b/tools/telemetry/telemetry/core/backends/chrome/android_browser_finder.py

index 2fa9fd0ad2e6bd2d9fe08246dd26fa1fb6b73cde..33fd1fc31b012a20db14f2692a8c6bc5a5d2ae9b 100644

--- a/tools/telemetry/telemetry/core/backends/chrome/android_browser_finder.py

+++ b/tools/telemetry/telemetry/core/backends/chrome/android_browser_finder.py

@@ -12,6 +12,7 @@ import sys

from telemetry import decorators

from telemetry.core import browser

+from telemetry.core import platform

from telemetry.core import possible_browser

from telemetry.core import util

from telemetry.core.backends import adb_commands

@@ -101,7 +102,8 @@ class PossibleAndroidBrowser(possible_browser.PossibleBrowser):

def Create(self):

use_rndis_forwarder = (self.finder_options.android_rndis or

- self.finder_options.browser_options.netsim)

+ self.finder_options.browser_options.netsim or

+ platform.GetHostPlatform().GetOSName() != 'linux')

backend = android_browser_backend.AndroidBrowserBackend(

self.finder_options.browser_options, self._backend_settings,

use_rndis_forwarder,