Android stack tool: Treat /data/data as a synonym for /data/user/0.

mojo/devtools/common/android_stack_parser/stack_utils.py

 # Copyright 2015 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.
 
 """Utility functions for the stack tool."""
 
 import glob
 import os
 import os.path
 import re
@@ skipping 60 matching lines @@
 
 
 def GetSymbolMapping(lines):
   """Returns a mapping (dictionary) from download file to .so."""
   regex = re.compile('Caching mojo app (\S+?)(?:\?\S+)? at (\S+)')
   mappings = {}
   for line in lines:
     result = regex.search(line)
     if result:
       url = GetBasenameFromMojoApp(result.group(1))
-      mappings[os.path.normpath(result.group(2))] = GetSymboledNameForMojoApp(
-          url)
+      path = os.path.normpath(result.group(2))
+      name = GetSymboledNameForMojoApp(url)
+      mappings[path] = name
+      if path.startswith('/data/user/0/'):
+        mappings[path.replace('/data/user/0/', '/data/data/', 1)] = name
   return mappings
 
 
 def _LowestAncestorContainingRelpath(dir_path, relpath):
   """Returns the lowest ancestor dir of |dir_path| that contains |relpath|.
   """
   cur_dir_path = os.path.abspath(dir_path)
   while True:
     if os.path.exists(os.path.join(cur_dir_path, relpath)):
       return cur_dir_path
 
     next_dir_path = os.path.dirname(cur_dir_path)
     if next_dir_path != cur_dir_path:
       cur_dir_path = next_dir_path
     else:
       return None
 
 
 def GuessDir(relpath):
   """Returns absolute path to location |relpath| in the lowest ancestor of this
   file that contains it."""
   lowest_ancestor = _LowestAncestorContainingRelpath(
       os.path.dirname(__file__), relpath)
   if not lowest_ancestor:
     return None
   return os.path.join(lowest_ancestor, relpath)