build/android/pylib/forwarder.py - Issue 1180693002: Update from https://crrev.com/333737

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 1180693002: Update from https://crrev.com/333737 (Closed) Base URL: https://github.com/domokit/mojo.git@master

Patch Set: rebased Created 5 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:

Index: build/android/pylib/forwarder.py

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

index d16b9b1c90a99b4649baa5fc3faf7051dc8485bc..c8c47d606019add911998f256ef8ed7861c0a144 100644

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

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

@@ -289,7 +289,8 @@ class Forwarder(object):

Forwarder._DEVICE_FORWARDER_FOLDER)])

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

device.RunShellCommand(

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

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

+ check_return=True)

self._initialized_devices.add(device_serial)

def _KillHostLocked(self):

@@ -326,4 +327,5 @@ class Forwarder(object):

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

Forwarder._DEVICE_FORWARDER_PATH)

device.RunShellCommand(

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

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

+ check_return=True)