Logdog for logcats

build/android/pylib/local/device/local_device_environment.py

Index: build/android/pylib/local/device/local_device_environment.py
diff --git a/build/android/pylib/local/device/local_device_environment.py b/build/android/pylib/local/device/local_device_environment.py
index 431614377efa68bd4cffecc6158f13d0d6673965..1d7c2a672ff374be1374adbb840d2a460a23fde9 100644
--- a/build/android/pylib/local/device/local_device_environment.py
+++ b/build/android/pylib/local/device/local_device_environment.py
@@ -3,12 +3,14 @@
 # found in the LICENSE file.
 
 import datetime
+import fileinput
 import functools
 import logging
 import os
 import shutil
 import tempfile
 import threading
+import sys
 
 from devil import base_error
 from devil.android import device_blacklist
@@ -188,6 +190,8 @@ class LocalDeviceEnvironment(environment.Environment):
       try:
         m.Stop()
         m.Close()
+        for line in fileinput.input([m.output_file], inplace=True):
+          sys.stdout.write('Device(%s) %s' % (m.adb.GetDeviceSerial(), line))
       except base_error.BaseError:
         logging.exception('Failed to stop logcat monitor for %s',
                           m.adb.GetDeviceSerial())