build/android/devil/android/sdk/split_select.py - Issue 1316413003: [Android] Add a configurable environment for devil/.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1316413003: [Android] Add a configurable environment for devil/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 3 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

« build/android/devil/android/battery_utils_test.py ('K') | « build/android/devil/android/sdk/shared_prefs_test.py ('k') | build/android/devil/env/__init__.py » ('j') | build/android/devil/env/__init__.py » ('J')
Expand Comments ('e') | Collapse Comments ('c') | 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 47fcea3cea616c9cdad4d593489e3e3c612be011..ec67d335c8d26b28e5af2cfb9c2ab9e99d7e44fe 100644

--- a/build/android/devil/android/sdk/split_select.py

+++ b/build/android/devil/android/sdk/split_select.py

@@ -6,10 +6,9 @@

import os

+from devil import env

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.

@@ -20,7 +19,7 @@ def _RunSplitSelectCmd(args):

Returns:

The output of the command.

"""

- cmd = [_SPLIT_SELECT_PATH] + args

+ cmd = [os.path.join(env.android_sdk.build_tools_path, 'split-select')] + args

status, output = cmd_helper.GetCmdStatusAndOutput(cmd)

if status != 0:

raise Exception('Failed running command "%s" with output "%s".' %