| Index: tools/telemetry/telemetry/internal/backends/chrome/android_browser_finder.py
|
| diff --git a/tools/telemetry/telemetry/internal/backends/chrome/android_browser_finder.py b/tools/telemetry/telemetry/internal/backends/chrome/android_browser_finder.py
|
| index ae6181f2ea68de1f8407d2c88dec8328388cb698..a4e5981d7035f396959c91b8cef8f306ba14d379 100644
|
| --- a/tools/telemetry/telemetry/internal/backends/chrome/android_browser_finder.py
|
| +++ b/tools/telemetry/telemetry/internal/backends/chrome/android_browser_finder.py
|
| @@ -14,10 +14,12 @@ from telemetry.core.platform import android_device
|
| from telemetry.core import possible_browser
|
| from telemetry.core import util
|
| from telemetry import decorators
|
| -from telemetry.internal.backends import adb_commands
|
| from telemetry.internal.backends import android_browser_backend_settings
|
| from telemetry.internal.backends.chrome import android_browser_backend
|
|
|
| +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' %
|
|
|