| 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)
|
|
|