| Index: build/android/devil/android/sdk/split_select.py
|
| diff --git a/build/android/devil/android/sdk/split_select.py b/build/android/devil/android/sdk/split_select.py
|
| index b47a21f9fe00b59b10b0ead9297d330691b900c2..47fcea3cea616c9cdad4d593489e3e3c612be011 100644
|
| --- a/build/android/devil/android/sdk/split_select.py
|
| +++ b/build/android/devil/android/sdk/split_select.py
|
| @@ -4,14 +4,12 @@
|
|
|
| """This module wraps Android's split-select tool."""
|
|
|
| -from devil.android.sdk import build_tools
|
| +import os
|
| +
|
| from devil.utils import cmd_helper
|
| -from devil.utils import lazy
|
| +from pylib import constants
|
|
|
| -
|
| -_split_select_path = lazy.WeakConstant(
|
| - lambda: build_tools.GetPath('split-select'))
|
| -
|
| +_SPLIT_SELECT_PATH = os.path.join(constants.ANDROID_SDK_TOOLS, 'split-select')
|
|
|
| def _RunSplitSelectCmd(args):
|
| """Runs a split-select command.
|
| @@ -22,7 +20,7 @@
|
| Returns:
|
| The output of the command.
|
| """
|
| - cmd = [_split_select_path.read()] + args
|
| + cmd = [_SPLIT_SELECT_PATH] + args
|
| status, output = cmd_helper.GetCmdStatusAndOutput(cmd)
|
| if status != 0:
|
| raise Exception('Failed running command "%s" with output "%s".' %
|
|
|