[android] Remove extra adb newlines from buildbot log

build/android/pylib/android_commands.py

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Provides an interface to communicate with the device via the adb command.
 
 Assumes adb binary is currently on system path.
 """
 
 import collections
@@ skipping 689 matching lines @@
       self.RunShellCommand('logcat -c')
     args = []
     if self._adb._target_arg:
       args += shlex.split(self._adb._target_arg)
     args += ['logcat', '-v', 'threadtime']
     if filters:
       args.extend(filters)
     else:
       args.append('*:v')
 
+    if logfile:
+      class NewLineNormalizer(object):
+        """A file-like object to normalize EOLs to '\n'.
+
+        Pexpect runs adb within a pseudo-tty device (see
+        http://www.noah.org/wiki/pexpect), so any '\n' printed by adb is written
+        as '\r\n' to the logfile. Since adb already uses '\r\n' to terminate
+        lines, the log ends up having '\r\r\n' at the end of each line. This
+        filter replaces the above with a single '\n' in the data stream.
+        """
+        def __init__(self, output):
+          self.output = output
+
+        def write(self, data):
+          data = data.replace('\r\r\n', '\n')
+          self.output.write(data)
+
+        def flush(self):
+          self.output.flush()
+
+      logfile = NewLineNormalizer(logfile)
+
     # Spawn logcat and syncronize with it.
     for _ in range(4):
       self._logcat = pexpect.spawn('adb', args, timeout=timeout,
                                    logfile=logfile)
       self.RunShellCommand('log startup_sync')
       if self._logcat.expect(['startup_sync', pexpect.EOF,
                               pexpect.TIMEOUT]) == 0:
         break
       self._logcat.close(force=True)
     else:
@@ skipping 300 matching lines @@
            ' '.join(['-c %s' % c for c in category]),
            '--throttle %d' % throttle,
            '-s %d' % seed,
            '-v ' * verbosity,
            '--monitor-native-crashes',
            '--kill-process-after-error',
            extra_args,
            '%d' % event_count]
     return self.RunShellCommand(' '.join(cmd),
                                 timeout_time=event_count*throttle*1.5)