Update build/android/symbolize.py to match base/debug/stack_trace_android.cc format.

build/android/symbolize.py

 #!/usr/bin/env python
 #
 # Copyright 2013 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.
 
 """Symbolizes stack traces generated by Chromium for Android.
 
 Sample usage:
   adb logcat chromium:V | symbolize.py
 """
 
 import os
 import re
 import sys
 
 from pylib import constants
 
 # Uses symbol.py from third_party/android_platform, not python's.
 sys.path.insert(0,
                 os.path.join(constants.DIR_SOURCE_ROOT,
                             'third_party/android_platform/development/scripts'))
 import symbol
 
 # Sample output from base/debug/stack_trace_android.cc
-#00 pc 000634c1 /data/app-lib/org.chromium.native_test-1/libbase_unittests.so
-TRACE_LINE = re.compile('(?P<frame>\#[0-9]+) pc (?P<addr>[0-9a-f]{8,8}) '
-                        '(?P<lib>[^\r\n \t]+)')
+#00 0x693cd34f /path/to/some/libfoo.so+0x0007434f
+TRACE_LINE = re.compile('(?P<frame>\#[0-9]+ 0x[0-9a-f]{8,8}) '
+                        '(?P<lib>[^+]+)\+0x(?P<addr>[0-9a-f]{8,8})')
 
 class Symbolizer(object):
   def __init__(self, file_in, file_out):
     self.file_in = file_in
     self.file_out = file_out
 
   def ProcessInput(self):
     for line in self.file_in:
       match = re.search(TRACE_LINE, line)
       if not match:
@@ skipping 19 matching lines @@
       # (e.g., adb logcat) when doing incremental development. Consider clearing
       # the cache when modification timestamp of libraries change.
       sym = symbol.SymbolInformation(lib, addr, False)[0][0]
 
       if not sym:
         self.file_out.write(line)
         self.file_out.flush()
         continue
 
       pre = line[0:match.start('frame')]
-      post = line[match.end('lib'):]
+      post = line[match.end('addr'):]
 
-      self.file_out.write('%s%s pc %s %s%s' % (pre, frame, addr, sym, post))
+      self.file_out.write(pre)
+      self.file_out.write(frame)
+      self.file_out.write(' ')
+      self.file_out.write(sym)
+      self.file_out.write(post)
       self.file_out.flush()
 
 
 def main():
   symbolizer = Symbolizer(sys.stdin, sys.stdout)
   symbolizer.ProcessInput()
 
 
 if __name__ == '__main__':
   main()