Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(687)

Unified Diff: build/android/devil/android/sdk/aapt.py

Issue 1502033002: Revert of [Android] Add a configurable environment for devil/. (RELAND 2) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build/android/devil/android/md5sum_test.py ('k') | build/android/devil/android/sdk/adb_wrapper.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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.
« no previous file with comments | « build/android/devil/android/md5sum_test.py ('k') | build/android/devil/android/sdk/adb_wrapper.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698