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..9faf0f7111f9a953919947e705b4f36b04f4d440 100644
--- a/build/android/pylib/local/device/local_device_environment.py
+++ b/build/android/pylib/local/device/local_device_environment.py
@@ -188,9 +188,18 @@ class LocalDeviceEnvironment(environment.Environment):
       try:
         m.Stop()
         m.Close()
+        _, temp_path = tempfile.mkstemp()
+        with open(m.output_file, 'r') as infile:
+          with open(temp_path, 'w') as outfile:
+            for line in infile:
+              outfile.write('Device(%s) %s' % (m.adb.GetDeviceSerial(), line))
+        shutil.move(temp_path, m.output_file)
       except base_error.BaseError:
         logging.exception('Failed to stop logcat monitor for %s',
                           m.adb.GetDeviceSerial())
+      except IOError:
+        logging.exception('Failed to locate logcat for device %s',
+                          m.adb.GetDeviceSerial())
 
     if self._logcat_output_file:
       file_utils.MergeFiles(