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

Unified Diff: build/android/devil/android/sdk/dexdump.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/sdk/build_tools.py ('k') | build/android/devil/android/sdk/fastboot.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/android/devil/android/sdk/dexdump.py
diff --git a/build/android/devil/android/sdk/dexdump.py b/build/android/devil/android/sdk/dexdump.py
index 992366e84ae4cc8f986a99fc711621823d7348dc..48d810f67c747e6eb0fd18a5c9136e5ca52dc722 100644
--- a/build/android/devil/android/sdk/dexdump.py
+++ b/build/android/devil/android/sdk/dexdump.py
@@ -2,13 +2,12 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-from devil.android.sdk import build_tools
+import os
+
from devil.utils import cmd_helper
-from devil.utils import lazy
+from pylib import constants
-
-_dexdump_path = lazy.WeakConstant(lambda: build_tools.GetPath('dexdump'))
-
+_DEXDUMP_PATH = os.path.join(constants.ANDROID_SDK_TOOLS, 'dexdump')
def DexDump(dexfiles, file_summary=False):
"""A wrapper around the Android SDK's dexdump tool.
@@ -23,7 +22,7 @@
# TODO(jbudorick): Add support for more options as necessary.
if isinstance(dexfiles, basestring):
dexfiles = [dexfiles]
- args = [_dexdump_path.read()] + dexfiles
+ args = [_DEXDUMP_PATH] + dexfiles
if file_summary:
args.append('-f')
« no previous file with comments | « build/android/devil/android/sdk/build_tools.py ('k') | build/android/devil/android/sdk/fastboot.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698