Snazzier dump log step on Android bots.

infra/bots/recipe_modules/flavor/gn_android_flavor.py

 # Copyright 2016 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.
 
 import default_flavor
 import subprocess
 
 # Data should go under in _data_dir, which may be preserved across runs.
 _data_dir = '/sdcard/revenge_of_the_skiabot/'
 # Executables go under _bin_dir, which, well, allows executable files.
@@ skipping 61 matching lines @@
               infra_step=True)
     self._run('gn gen', 'gn', 'gen', self.out_dir, '--args=' + gn_args)
     self._run('ninja', 'ninja', '-C', self.out_dir)
 
   def install(self):
     self._adb('mkdir ' + self.device_dirs.resource_dir,
               'shell', 'mkdir', '-p', self.device_dirs.resource_dir)
 
   def cleanup_steps(self):
     if self._ever_ran_adb:
-      self._adb('dump log', 'logcat', '-d')
+      self.m.python.inline('dump log', """
+      import os
+      import subprocess
+      import sys
+      out = sys.argv[1]
+      log = subprocess.check_output(['adb', 'logcat', '-d'])
+      for line in log.split('\\n'):
+        tokens = line.split()
+        if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':
+          addr, path = tokens[-2:]
+          local = os.path.join(out, os.path.basename(path))
+          if os.path.exists(local):
+            sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])
+            line = line.replace(addr, addr + ' ' + sym.strip())
+        print line
+      """,
+      args=[self.m.vars.skia_out.join(self.m.vars.configuration)],
+      infra_step=True)
       self._adb('reboot', 'reboot')
       self._adb('kill adb server', 'kill-server')
 
   def step(self, name, cmd, env=None, **kwargs):
     app = self.m.vars.skia_out.join(self.m.vars.configuration, cmd[0])
     self._adb('push %s' % cmd[0],
               'push', app, _bin_dir)
 
     sh = '%s.sh' % cmd[0]
     self.m.run.writefile(self.m.vars.tmp_dir.join(sh),
@@ skipping 45 matching lines @@
   def read_file_on_device(self, path):
     return self._adb('read %s' % path,
                      'shell', 'cat', path, stdout=self.m.raw_io.output()).stdout
 
   def remove_file_on_device(self, path):
     self._adb('rm %s' % path, 'shell', 'rm', '-f', path)
 
   def create_clean_device_dir(self, path):
     self._adb('rm %s' % path, 'shell', 'rm', '-rf', path)
     self._adb('mkdir %s' % path, 'shell', 'mkdir', '-p', path)