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

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

Issue 1415413005: Revert of [Android] Add a configurable environment for devil/. (RELAND) (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/sdk/shared_prefs_test.py ('k') | build/android/devil/devil_dependencies.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/android/devil/android/sdk/split_select.py
diff --git a/build/android/devil/android/sdk/split_select.py b/build/android/devil/android/sdk/split_select.py
index 11e77c2df94c2e636ce9a7285986025ece379414..47fcea3cea616c9cdad4d593489e3e3c612be011 100644
--- a/build/android/devil/android/sdk/split_select.py
+++ b/build/android/devil/android/sdk/split_select.py
@@ -4,9 +4,12 @@
"""This module wraps Android's split-select tool."""
-from devil import devil_env
+import os
+
from devil.utils import cmd_helper
+from pylib import constants
+_SPLIT_SELECT_PATH = os.path.join(constants.ANDROID_SDK_TOOLS, 'split-select')
def _RunSplitSelectCmd(args):
"""Runs a split-select command.
@@ -17,8 +20,7 @@
Returns:
The output of the command.
"""
- split_select_path = devil_env.config.FetchPath('split-select')
- cmd = [split_select_path] + args
+ cmd = [_SPLIT_SELECT_PATH] + args
status, output = cmd_helper.GetCmdStatusAndOutput(cmd)
if status != 0:
raise Exception('Failed running command "%s" with output "%s".' %
« no previous file with comments | « build/android/devil/android/sdk/shared_prefs_test.py ('k') | build/android/devil/devil_dependencies.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698