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

Unified Diff: tools/telemetry/telemetry/core/android_process.py

Issue 1145153005: Revert of [Android] Remove adb_commands from telemetry. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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 | « build/android/pylib/screenshot.py ('k') | tools/telemetry/telemetry/core/backends/adb_commands.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 bfbd293525b734e389d3f00d99e0319125eadc82..62134c2ea9f0a5ffe286c65539cba4516b692272 100644
--- a/tools/telemetry/telemetry/core/android_process.py
+++ b/tools/telemetry/telemetry/core/android_process.py
@@ -2,16 +2,9 @@
# 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
@@ -23,7 +16,7 @@
self._app_backend = app_backend
self._pid = pid
self._name = name
- self._local_port = ports.AllocateTestServerPort()
+ self._local_port = adb_commands.AllocateTestServerPort()
self._devtools_client = None
@property
« no previous file with comments | « build/android/pylib/screenshot.py ('k') | tools/telemetry/telemetry/core/backends/adb_commands.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698