Merge "Allow fixup of apex directories." am: 53c707781a am: b57824f4c1 am: 685afba9aa am: 317cb82f25

Original change: https://android-review.googlesource.com/c/platform/development/+/2072700

Change-Id: Iacbb5ba5e6206a52e2a6416b9d57278bdf1266a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

scripts/stack_core.py

@@ -343,6 +343,15 @@ class TraceConverter:
     if os.path.isfile(symbol_dir + lib):
       return lib
 
+    # Try and rewrite any apex files if not found in symbols.
+    # For some reason, the directory in symbols does not match
+    # the path on system.
+    # The path is com.android.<directory> on device, but
+    # com.google.android.<directory> in symbols.
+    new_lib = lib.replace("/com.android.", "/com.google.android.")
+    if os.path.isfile(symbol_dir + new_lib):
+      return new_lib
+
     # When using atest, test paths are different between the out/ directory
     # and device. Apply fixups.
     if not lib.startswith("/data/local/tests/") and not lib.startswith("/data/local/tmp/"):