build/android/pylib/forwarder.py - Issue 1092703002: [Android] More old_interface conversions in build/android/.

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/pylib/forwarder.py

Issue 1092703002: [Android] More old_interface conversions in build/android/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: perezju comments Created 5 years, 8 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/pylib/constants/keyevent.py ('k') | build/android/pylib/local/device/local_device_instrumentation_test_run.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: build/android/pylib/forwarder.py

diff --git a/build/android/pylib/forwarder.py b/build/android/pylib/forwarder.py

index eb83d68444f87e2c0c788d16a9db9e8a8d7324f0..d16b9b1c90a99b4649baa5fc3faf7051dc8485bc 100644

--- a/build/android/pylib/forwarder.py

+++ b/build/android/pylib/forwarder.py

@@ -288,11 +288,8 @@ class Forwarder(object):

self._device_forwarder_path_on_host,

Forwarder._DEVICE_FORWARDER_FOLDER)])

cmd = '%s %s' % (tool.GetUtilWrapper(), Forwarder._DEVICE_FORWARDER_PATH)

- (exit_code, output) = device.old_interface.GetAndroidToolStatusAndOutput(

- cmd, lib_path=Forwarder._DEVICE_FORWARDER_FOLDER)

- if exit_code != 0:

- raise Exception(

- 'Failed to start device forwarder:\n%s' % '\n'.join(output))

+ device.RunShellCommand(

+ cmd, env={'LD_LIBRARY_PATH': Forwarder._DEVICE_FORWARDER_FOLDER})

self._initialized_devices.add(device_serial)

def _KillHostLocked(self):

@@ -328,5 +325,5 @@ class Forwarder(object):

cmd = '%s %s --kill-server' % (tool.GetUtilWrapper(),

Forwarder._DEVICE_FORWARDER_PATH)

- device.old_interface.GetAndroidToolStatusAndOutput(

- cmd, lib_path=Forwarder._DEVICE_FORWARDER_FOLDER)

+ device.RunShellCommand(

+ cmd, env={'LD_LIBRARY_PATH': Forwarder._DEVICE_FORWARDER_FOLDER})