scripts/slave/recipe_modules/chromium_android/api.py - Issue 2065843002: [Android] Only pass --adb-path to adb_install_apk for M51 and above.

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: scripts/slave/recipe_modules/chromium_android/api.py

Issue 2065843002: [Android] Only pass --adb-path to adb_install_apk for M51 and above. (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@update-version

Patch Set: Created 4 years, 6 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 | « no previous file | scripts/slave/recipe_modules/chromium_android/example.expected/downgrade_install_tester_basic.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: scripts/slave/recipe_modules/chromium_android/api.py

diff --git a/scripts/slave/recipe_modules/chromium_android/api.py b/scripts/slave/recipe_modules/chromium_android/api.py

index 8d989dea1cd45651e19324acf1eb62ebe7c839f0..a7c9a8a25617f571aa781c9663239e2855f2bd0f 100644

--- a/scripts/slave/recipe_modules/chromium_android/api.py

+++ b/scripts/slave/recipe_modules/chromium_android/api.py

@@ -502,8 +502,9 @@ class AndroidApi(recipe_api.RecipeApi):

'android',

'adb_install_apk.py'),

apk, '-v', '--blacklist-file', self.blacklist_file,

- '--adb-path', self.m.adb.adb_path(),

]

+ if int(self.m.chromium.get_version().get('MAJOR', 0)) > 50:

martiniss 2016/06/13 23:17:30 this should be get('MAJOR', '0'), right?

jbudorick 2016/06/14 19:03:04 It doesn't matter -- int(0) and int('0') will both

+ install_cmd += ['--adb-path', self.m.adb.adb_path()]

if devices and isinstance(devices, list):

for d in devices:

install_cmd += ['-d', d]

« no previous file with comments | « no previous file | scripts/slave/recipe_modules/chromium_android/example.expected/downgrade_install_tester_basic.json » ('j') | no next file with comments »