[Android]: Fix tombstones.py architecture detection.

build/android/tombstones.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.
 #
 # Find the most recent tombstone file(s) on all connected devices
 # and prints their stacks.
 #
 # Assumes tombstone file was created with current symbols.
 
 import datetime
 import multiprocessing
 import os
+import re
 import subprocess
 import sys
 import optparse
 
 from pylib import android_commands
 from pylib.device import device_utils
 
 
 def _ListTombstones(device):
   """List the tombstone files on the device.
@@ skipping 44 matching lines @@
   """Deletes a tombstone from the device.
 
   Args:
     device: An instance of DeviceUtils.
     tombstone_file: the tombstone to delete.
   """
   return device.RunShellCommand(
       'rm /data/tombstones/' + tombstone_file, as_root=True)
 
 
-def _ResolveSymbols(tombstone_data, include_stack, arch):
+def _DeviceAbiToArch(device_abi):
+  # The order of this list is significant to find the more specific match (e.g.,
+  # arm64) before the less specific (e.g., arm).
+  arches = ['arm64', 'arm', 'x86_64', 'x86_64', 'x86', 'mips']
+  for arch in arches:
+    if arch in device_abi:
+      return arch
+  raise RuntimeError('Unknown device ABI: %s' % device_abi)
+
+def _ResolveSymbols(tombstone_data, include_stack, device_abi):
   """Run the stack tool for given tombstone input.
 
   Args:
     tombstone_data: a list of strings of tombstone data.
     include_stack: boolean whether to include stack data in output.
-    arch: the device architecture of tombstone data.
+    device_abi: the default ABI of the device which generated the tombstone.
 
   Yields:
     A string for each line of resolved stack output.
   """
+  # Check if the tombstone data has an ABI listed, if so use this in preference
+  # to the device's default ABI.
+  for line in tombstone_data:
+    found_abi = re.search('ABI: \'(.+?)\'', line)
+    if found_abi:
+      device_abi = found_abi.group(1)
+  arch = _DeviceAbiToArch(device_abi)
+  if not arch:
+    return
+
   stack_tool = os.path.join(os.path.dirname(__file__), '..', '..',
                             'third_party', 'android_platform', 'development',
                             'scripts', 'stack')
   proc = subprocess.Popen([stack_tool, '--arch', arch], stdin=subprocess.PIPE,
                           stdout=subprocess.PIPE)
   output = proc.communicate(input='\n'.join(tombstone_data))[0]
   for line in output.split('\n'):
     if not include_stack and 'Stack Data:' in line:
       break
     yield line
 
 
 def _ResolveTombstone(tombstone):
   lines = []
   lines += [tombstone['file'] + ' created on ' + str(tombstone['time']) +
             ', about this long ago: ' +
             (str(tombstone['device_now'] - tombstone['time']) +
             ' Device: ' + tombstone['serial'])]
   print '\n'.join(lines)
   print 'Resolving...'
   lines += _ResolveSymbols(tombstone['data'], tombstone['stack'],
-                           tombstone['arch'])
+                           tombstone['device_abi'])
   return lines
 
 
 def _ResolveTombstones(jobs, tombstones):
   """Resolve a list of tombstones.
 
   Args:
     jobs: the number of jobs to use with multiprocess.
     tombstones: a list of tombstones.
   """
@@ skipping 24 matching lines @@
 
   # Sort the tombstones in date order, descending
   all_tombstones.sort(cmp=lambda a, b: cmp(b[1], a[1]))
 
   # Only resolve the most recent unless --all-tombstones given.
   tombstones = all_tombstones if options.all_tombstones else [all_tombstones[0]]
 
   device_now = _GetDeviceDateTime(device)
   for tombstone_file, tombstone_time in tombstones:
     ret += [{'serial': str(device),
-             'arch': device.GetProp('ro.product.cpu.abi'),
+             'device_abi': device.GetProp('ro.product.cpu.abi'),
              'device_now': device_now,
              'time': tombstone_time,
              'file': tombstone_file,
              'stack': options.stack,
              'data': _GetTombstoneData(device, tombstone_file)}]
 
   # Erase all the tombstones if desired.
   if options.wipe_tombstones:
     for tombstone_file, _ in all_tombstones:
       _EraseTombstone(device, tombstone_file)
@@ skipping 26 matching lines @@
 
   tombstones = []
   for device_serial in devices:
     device = device_utils.DeviceUtils(device_serial)
     tombstones += _GetTombstonesForDevice(device, options)
 
   _ResolveTombstones(options.jobs, tombstones)
 
 if __name__ == '__main__':
   sys.exit(main())