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

Unified Diff: build/android/devil/android/md5sum.py

Issue 1390613002: Revert of [Android] Add a configurable environment for devil/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 2 months 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/logcat_monitor_test.py ('k') | build/android/devil/android/md5sum_test.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/android/devil/android/md5sum.py
diff --git a/build/android/devil/android/md5sum.py b/build/android/devil/android/md5sum.py
index 7b12af51b5a447f66e188191786e726d74b08396..dbd988fdb33cdd5769c91232168cc056a3388bd6 100644
--- a/build/android/devil/android/md5sum.py
+++ b/build/android/devil/android/md5sum.py
@@ -6,9 +6,9 @@
import posixpath
import re
-from devil import devil_env
from devil.android import device_errors
from devil.utils import cmd_helper
+from pylib import constants
MD5SUM_DEVICE_LIB_PATH = '/data/local/tmp/md5sum'
MD5SUM_DEVICE_BIN_PATH = MD5SUM_DEVICE_LIB_PATH + '/md5sum_bin'
@@ -30,7 +30,8 @@
if isinstance(paths, basestring):
paths = [paths]
- md5sum_bin_host_path = devil_env.config.md5sum_host_path
+ md5sum_bin_host_path = os.path.join(
+ constants.GetOutDirectory(), 'md5sum_bin_host')
if not os.path.exists(md5sum_bin_host_path):
raise IOError('File not built: %s' % md5sum_bin_host_path)
out = cmd_helper.GetCmdOutput([md5sum_bin_host_path] + [p for p in paths])
@@ -57,7 +58,7 @@
# Allow generators
paths = list(paths)
- md5sum_dist_path = devil_env.config.md5sum_device_path
+ md5sum_dist_path = os.path.join(constants.GetOutDirectory(), 'md5sum_dist')
md5sum_dist_bin_path = os.path.join(md5sum_dist_path, 'md5sum_bin')
if not os.path.exists(md5sum_dist_path):
« no previous file with comments | « build/android/devil/android/logcat_monitor_test.py ('k') | build/android/devil/android/md5sum_test.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698