Android: Make stack tool work for GN builds

third_party/android_platform/development/scripts/symbol.py

Index: third_party/android_platform/development/scripts/symbol.py
diff --git a/third_party/android_platform/development/scripts/symbol.py b/third_party/android_platform/development/scripts/symbol.py
index b72253d63134446653e9db89dc97ddd6a8518394..83272994eb3daa8432b401a4d033fadd322c7569 100755
--- a/third_party/android_platform/development/scripts/symbol.py
+++ b/third_party/android_platform/development/scripts/symbol.py
@@ -29,18 +29,20 @@ import subprocess
 import sys
 import zipfile
 
-CHROME_SRC = os.path.join(os.path.realpath(os.path.dirname(__file__)),
-                          os.pardir, os.pardir, os.pardir, os.pardir)
+sys.path.insert(0, os.path.join(os.path.dirname(__file__),
+                                os.pardir, os.pardir, os.pardir, os.pardir,
+                                'build', 'android'))
+from pylib import constants
+from pylib.symbols import elf_symbolizer
+
+
+CHROME_SRC = constants.DIR_SOURCE_ROOT
 ANDROID_BUILD_TOP = CHROME_SRC
 SYMBOLS_DIR = CHROME_SRC
-CHROME_SYMBOLS_DIR = CHROME_SRC
-
+CHROME_SYMBOLS_DIR = None
 ARCH = "arm"
-
 TOOLCHAIN_INFO = None
 
-sys.path.insert(0, os.path.join(CHROME_SRC, 'build', 'android'))
-from pylib.symbols import elf_symbolizer
 
 # See:
 # http://bugs.python.org/issue14315
@@ -202,10 +204,19 @@ def PathListJoin(prefix_list, suffix_list):
    """
    return [
        os.path.join(prefix, suffix)
-       for prefix in prefix_list for suffix in suffix_list ]
+       for suffix in suffix_list for prefix in prefix_list ]

[johnme, 2015/10/20 18:53:27]

Nit: is there still any reason to change this?

[agrieve, 2015/10/20 19:27:49]

Shouldn't be necessary anymore (it was needed to sort lib.unstripped before
others).
However, I'd like to keep it since it seems like a smarted way to apply
prefix_lists / suffix_list (sort by prefix, then suffix rather than suffix, then
prefix)

+
+
+def _GetChromeOutputDirCandidates():
+  """Returns a list of output directories to look in."""
+  if os.environ.get('CHROMIUM_OUTPUT_DIR') or os.environ.get('BUILDTYPE'):
+    return [constants.GetOutDirectory()]
+  return [constants.GetOutDirectory(build_type='Debug'),
+          constants.GetOutDirectory(build_type='Release')]
+
 
 def GetCandidates(dirs, filepart, candidate_fun):
-  """Returns a list of candidate filenames.
+  """Returns a list of candidate filenames, sorted by modification time.
 
   Args:
     dirs: a list of the directory part of the pathname.
@@ -213,23 +224,13 @@ def GetCandidates(dirs, filepart, candidate_fun):
     candidate_fun: a function to apply to each candidate, returns a list.
 
   Returns:
-    A list of candidate files ordered by modification time, newest first.
+    A list of candidate files filtered by candidate_fun, in the order given.

[johnme, 2015/10/20 18:53:27]

s/in the order given/newest first/

[agrieve, 2015/10/20 19:27:49]

Done.

   """
-  out_dir = os.environ.get('CHROMIUM_OUT_DIR', 'out')
-  out_dir = os.path.join(CHROME_SYMBOLS_DIR, out_dir)
-  buildtype = os.environ.get('BUILDTYPE')
-  if buildtype:
-    buildtype_list = [ buildtype ]
-  else:
-    buildtype_list = [ 'Debug', 'Release' ]
-
-  candidates = PathListJoin([out_dir], buildtype_list) + [CHROME_SYMBOLS_DIR]
-  candidates = PathListJoin(candidates, dirs)
-  candidates = PathListJoin(candidates, [filepart])
+  candidates = PathListJoin(dirs, [filepart])
   logging.debug('GetCandidates: prefiltered candidates = %s' % candidates)
   candidates = list(
       itertools.chain.from_iterable(map(candidate_fun, candidates)))
-  candidates = sorted(candidates, key=os.path.getmtime, reverse=True)
+  candidates.sort(key=os.path.getmtime, reverse=True)
   return candidates
 
 def GetCandidateApks():
@@ -241,7 +242,8 @@ def GetCandidateApks():
   Returns:
     list of APK filename which could contain the library.
   """
-  return GetCandidates(['apks'], '*.apk', glob.glob)
+  dirs = PathListJoin(_GetChromeOutputDirCandidates(), ['apks'])
+  return GetCandidates(dirs, '*.apk', glob.glob)
 
 def GetCrazyLib(apk_filename):
   """Returns the name of the first crazy library from this APK.
@@ -294,6 +296,12 @@ def MapDeviceApkToLibrary(device_apk_name):
     if crazy_lib:
       return crazy_lib
 
+def GetLibrarySearchPaths():
+  if CHROME_SYMBOLS_DIR:
+    return [CHROME_SYMBOLS_DIR]

[johnme, 2015/10/20 18:53:27]

This seems to be a change in behaviour. Previously it would try to append 'lib',
'lib.target' etc to CHROME_SYMBOLS_DIR, whereas now it only looks in that exact
path. Is that intentional?

[agrieve, 2015/10/20 19:27:49]

Intentional:

Note that it does *not* work if you set --chrome-symbols-dir to your out/Debug,
but *does* work if you set CHROMIUM_OUTPUT_DIR=out/Debug. This environment
variable is consistent with most other scripts (e.g. adb_gdb).

The reason it doesn't work, is that the stripped .so files exist under
out-gn/Debug, so you'd actually want to use out-gn/Debug/lib.unstripped, and I
couldn't stomach having --chrome-symbols-dir not use the .so files I explicitly
pointed it at.

+  dirs = _GetChromeOutputDirCandidates()
+  return PathListJoin(dirs, ['lib.unstripped', 'lib', 'lib.target', '.'])
+
 def GetCandidateLibraries(library_name):
   """Returns a list of candidate library filenames.
 
@@ -303,9 +311,15 @@ def GetCandidateLibraries(library_name):
   Returns:
     A list of matching library filenames for library_name.
   """
-  return GetCandidates(
-      ['lib', 'lib.target', '.'], library_name,
+  candidates = GetCandidates(
+      GetLibrarySearchPaths(), library_name,
       lambda filename: filter(os.path.exists, [filename]))
+  # For GN, candidates includes both stripped an unstripped libraries. Stripped
+  # libraries are always newer. Explicitly look for .unstripped and sort them
+  # ahead.
+  candidates.sort(key=lambda c: int('unstripped' not in c))
+  return candidates
+
 
 def TranslateLibPath(lib):
   # The filename in the stack trace maybe an APK name rather than a library