🌿 Fix stack tool when packed relocations exist and built with GN

third_party/android_platform/development/scripts/stack_libs.py

 #!/usr/bin/env python
 #
 # Copyright (c) 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.
 
 
 """Identifies address adjustments required for native crash dumps."""
 
 import glob
@@ skipping 72 matching lines @@
   # would return 0x1d6000. Ignores all non-LOAD lines.
   for line in _ReadElfProgramHeaders(lib):
     elements = line.split()
     if elements and elements[0] == 'LOAD':
       vaddrs.append(int(elements[2], 16))
   if vaddrs:
     return min(vaddrs)
   return 0
 
 
-def GetLoadVaddrs(apk_dir):
-  """Return a dictionary of minimum VirtAddr fields for libraries in apk_dir.
+def GetLoadVaddrs(stripped_libs_dir):
+  """Return a dict of minimum VirtAddr for libraries in the given directory.
 
   The dictionary returned may be passed to stack_core.ConvertTrace(). In
   pre-M Android releases the addresses printed by debuggerd into tombstones
   do not take account of non-zero vaddrs. Here we collect this information,
   so that we can use it later to correct such debuggerd tombstones.
 
   Args:
-    apk_dir: Path to APK staging directory.
+    stripped_libs_dir: Path to directory containing apk's stripped libraries.
   Returns:
     {'libchrome.so': 12345, ...}
   """
-  pathname = apk_dir + '/libs/*/*.so'
-  libs = [lib for lib in glob.glob(pathname) if _HasElfHeader(lib)]
+  libs = glob.glob(os.path.join(stripped_libs_dir, '*.so'))
+  libs = [l for l in libs if _HasElfHeader(l)]
 
   load_vaddrs = {}
   for lib in libs:
     min_vaddr = _FindMinLoadVaddr(lib)
     if min_vaddr:
       # Store with the library basename as the key. This is because once on
       # the device its path may not fully match its place in the APK staging
       # directory
       load_vaddrs[os.path.basename(lib)] = min_vaddr
 
   # Direct load from APK causes debuggerd to tag trace lines as if from the
   # file .../base.apk. So if we encounter a libchrome.so with packed
   # relocations, replicate this as base.apk so that later adjustment code
   # finds the appropriate adjustment.
   if _LIBCHROME_SO in load_vaddrs:
     load_vaddrs[_BASE_APK] = load_vaddrs[_LIBCHROME_SO]
 
   return load_vaddrs