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 d4402a4eed3ee02f1bb3e7bdc3f0dea296f01293..8091cd0e58317fd54a77dd238f8e3ec998f2e4c4 100644 |
--- a/tools/telemetry/telemetry/core/backends/chrome/android_browser_finder.py |
+++ b/tools/telemetry/telemetry/core/backends/chrome/android_browser_finder.py |
@@ -7,7 +7,6 @@ |
import logging |
import os |
-from telemetry.core.backends import adb_commands |
from telemetry.core.backends import android_browser_backend_settings |
from telemetry.core.backends.chrome import android_browser_backend |
from telemetry.core import browser |
@@ -18,6 +17,9 @@ from telemetry.core import possible_browser |
from telemetry.core import util |
from telemetry import decorators |
+util.AddDirToPythonPath(util.GetChromiumSrcDir(), 'build', 'android') |
+from pylib.utils import apk_helper # pylint: disable=import-error |
+ |
CHROME_PACKAGE_NAMES = { |
'android-content-shell': |
@@ -170,7 +172,7 @@ def _FindAllPossibleBrowsers(finder_options, android_platform): |
CanPossiblyHandlePath(finder_options.browser_executable)): |
normalized_path = os.path.expanduser(finder_options.browser_executable) |
- exact_package = adb_commands.GetPackageName(normalized_path) |
+ exact_package = apk_helper.GetPackageName(normalized_path) |
if not exact_package: |
raise exceptions.PackageDetectionError( |
'Unable to find package for %s specified by --browser-executable' % |