build/android/devil/devil_env.py - Issue 1565763002: [Android] Revise devil handling of host platforms.

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/devil_env.py

Issue 1565763002: [Android] Revise devil handling of host platforms. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 11 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:

Index: build/android/devil/devil_env.py

diff --git a/build/android/devil/devil_env.py b/build/android/devil/devil_env.py

index 07bb658ced30a444a4af5d0694b7982edc798046..efec60307fd35682f1e2dfb20fbb1521cce30cde 100644

--- a/build/android/devil/devil_env.py

+++ b/build/android/devil/devil_env.py

@@ -38,11 +38,11 @@ _DEVIL_DEFAULT_CONFIG = os.path.abspath(os.path.join(

_LEGACY_ENVIRONMENT_VARIABLES = {

'ADB_PATH': {

'dependency_name': 'adb',

- 'platform': 'linux_x86_64',

+ 'platform': 'linux2_x86_64',

'ANDROID_SDK_ROOT': {

'dependency_name': 'android_sdk',

- 'platform': 'linux_x86_64',

+ 'platform': 'linux2_x86_64',

}

@@ -139,7 +139,7 @@ class _Environment(object):

def GetPlatform(arch=None, device=None):

if device:

return 'android_%s' % (arch or device.product_cpu_abi)

- return 'linux_%s' % platform.machine()

+ return '%s_%s' % (sys.platform, platform.machine())

jbudorick 2016/01/06 14:56:58 This is why. Mac users were seeing this try to dow

config = _Environment()

« no previous file with comments | « build/android/devil/devil_dependencies.json ('k') | build/android/devil/devil_env_test.py » ('j') | no next file with comments »