| Index: tools/telemetry/telemetry/core/chrome/android_browser_finder.py
|
| diff --git a/tools/telemetry/telemetry/android_browser_finder.py b/tools/telemetry/telemetry/core/chrome/android_browser_finder.py
|
| similarity index 94%
|
| rename from tools/telemetry/telemetry/android_browser_finder.py
|
| rename to tools/telemetry/telemetry/core/chrome/android_browser_finder.py
|
| index da85327032ebc871a878b323edb14a000536ad9b..b455f58512201ddeabf4324ba88049badd22ae5f 100644
|
| --- a/tools/telemetry/telemetry/android_browser_finder.py
|
| +++ b/tools/telemetry/telemetry/core/chrome/android_browser_finder.py
|
| @@ -9,11 +9,11 @@ import re
|
| import subprocess
|
| import sys
|
|
|
| -from telemetry import adb_commands
|
| -from telemetry import android_browser_backend
|
| -from telemetry import android_platform
|
| -from telemetry import browser
|
| -from telemetry import possible_browser
|
| +from telemetry.core import browser
|
| +from telemetry.core import possible_browser
|
| +from telemetry.core.chrome import adb_commands
|
| +from telemetry.core.chrome import android_browser_backend
|
| +from telemetry.core.chrome import android_platform
|
|
|
| CHROME_PACKAGE_NAMES = {
|
| 'android-chrome': 'com.google.android.apps.chrome',
|
| @@ -86,7 +86,7 @@ def FindAllAvailableBrowsers(options, logging=real_logging):
|
| logging.warn(' sudo `which adb` devices\n\n')
|
| except OSError:
|
| platform_tools_path = os.path.join(
|
| - os.path.dirname(__file__), '..', '..', '..',
|
| + os.path.dirname(__file__), '..', '..', '..', '..', '..'
|
| 'third_party', 'android_tools', 'sdk', 'platform-tools')
|
| if (sys.platform.startswith('linux') and
|
| os.path.exists(os.path.join(platform_tools_path, 'adb'))):
|
|
|