Index: tools/telemetry/telemetry/core/android_process.py |
diff --git a/tools/telemetry/telemetry/core/android_process.py b/tools/telemetry/telemetry/core/android_process.py |
index 62134c2ea9f0a5ffe286c65539cba4516b692272..bfbd293525b734e389d3f00d99e0319125eadc82 100644 |
--- a/tools/telemetry/telemetry/core/android_process.py |
+++ b/tools/telemetry/telemetry/core/android_process.py |
@@ -2,10 +2,17 @@ |
# Use of this source code is governed by a BSD-style license that can be |
# found in the LICENSE file. |
-from telemetry.core.backends import adb_commands |
from telemetry.core.backends.chrome_inspector import devtools_client_backend |
+from telemetry.core import util |
from telemetry.core import web_contents |
+util.AddDirToPythonPath(util.GetChromiumSrcDir(), 'build', 'android') |
+try: |
+ from pylib import ports # pylint: disable=import-error |
+except ImportError: |
+ ports = None |
+ |
+ |
class WebViewNotFoundException(Exception): |
pass |
@@ -16,7 +23,7 @@ class AndroidProcess(object): |
self._app_backend = app_backend |
self._pid = pid |
self._name = name |
- self._local_port = adb_commands.AllocateTestServerPort() |
+ self._local_port = ports.AllocateTestServerPort() |
self._devtools_client = None |
@property |