Index: build/android/pylib/forwarder.py |
diff --git a/build/android/pylib/forwarder.py b/build/android/pylib/forwarder.py |
index 111e1742c6fced754b904dc47251698e2fe3dac4..568a925e0bb1d0e799f25da228dc88cf7fee7e00 100644 |
--- a/build/android/pylib/forwarder.py |
+++ b/build/android/pylib/forwarder.py |
@@ -96,6 +96,12 @@ class Forwarder(object): |
else: raise |
if exit_code != 0: |
Forwarder._KillDeviceLocked(device, tool) |
+ # Log alive forwarders |
+ ps_out = device.RunShellCommand(['ps']) |
+ logging.info('Currently running device_forwarders:') |
+ for line in ps_out: |
+ if 'device_forwarder' in line: |
+ logging.info(' %s', line) |
raise Exception('%s exited with %d:\n%s' % ( |
instance._host_forwarder_path, exit_code, '\n'.join(output))) |
tokens = output.split(':') |