| Index: build/android/devil/android/sdk/aapt.py
|
| diff --git a/build/android/devil/android/sdk/aapt.py b/build/android/devil/android/sdk/aapt.py
|
| index 7ae3a9380afc0d5feb364b727b8f5413407fe754..1c051e0c55fbe3f232891ef1ecc26d26fcbe892f 100644
|
| --- a/build/android/devil/android/sdk/aapt.py
|
| +++ b/build/android/devil/android/sdk/aapt.py
|
| @@ -4,13 +4,12 @@
|
|
|
| """This module wraps the Android Asset Packaging 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
|
|
|
| -
|
| -_aapt_path = lazy.WeakConstant(lambda: build_tools.GetPath('aapt'))
|
| -
|
| +_AAPT_PATH = os.path.join(constants.ANDROID_SDK_TOOLS, 'aapt')
|
|
|
| def _RunAaptCmd(args):
|
| """Runs an aapt command.
|
| @@ -21,13 +20,12 @@
|
| Returns:
|
| The output of the command.
|
| """
|
| - cmd = [_aapt_path.read()] + args
|
| + cmd = [_AAPT_PATH] + args
|
| status, output = cmd_helper.GetCmdStatusAndOutput(cmd)
|
| if status != 0:
|
| raise Exception('Failed running aapt command: "%s" with output "%s".' %
|
| (' '.join(cmd), output))
|
| return output
|
| -
|
|
|
| def Dump(what, apk, assets=None):
|
| """Returns the output of the aapt dump command.
|
|
|