Index: build/android/devil/android/md5sum.py |
diff --git a/build/android/devil/android/md5sum.py b/build/android/devil/android/md5sum.py |
index 6a788dad0b270e3a3f309972bbec9b6e8fe22771..c5607e7db995227dd0e5ce0d48dd3efa34465631 100644 |
--- a/build/android/devil/android/md5sum.py |
+++ b/build/android/devil/android/md5sum.py |
@@ -6,9 +6,9 @@ import os |
import posixpath |
import re |
+from devil import 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' |
@@ -31,7 +31,7 @@ def CalculateHostMd5Sums(paths): |
paths = [paths] |
md5sum_bin_host_path = os.path.join( |
- constants.GetOutDirectory(), 'md5sum_bin_host') |
+ env.binaries.binary_dir, '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]) |
@@ -58,7 +58,7 @@ def CalculateDeviceMd5Sums(paths, device): |
# Allow generators |
paths = list(paths) |
- md5sum_dist_path = os.path.join(constants.GetOutDirectory(), 'md5sum_dist') |
+ md5sum_dist_path = os.path.join(env.binaries.binary_dir, 'md5sum_dist') |
md5sum_dist_bin_path = os.path.join(md5sum_dist_path, 'md5sum_bin') |
if not os.path.exists(md5sum_dist_path): |