commit 83e76590e61366355da4be9febd533febc2241d8
author John Bauman <jbauman@google.com> Thu Dec 16 20:49:22 2021 +0000
committer John Bauman <jbauman@google.com> Tue Dec 21 19:02:21 2021 +0000
tree 554d6151db4a342bb2ae5eda9e823f2a5ca05d7d
parent 93f8df5ef9bb1c48f7010232ad5f219cab08d461

Use build_id_entry templates for all shared libraries

Using the build_id_entry template should allow symbolization of backtraces
to work.

Change-Id: Ib363756f7eb59364b3370c3ffaf6fa5418a620ce

fuchsia/BUILD.gn

diff --git a/fuchsia/BUILD.gn b/fuchsia/BUILD.gn
index 4468513..600068c 100644
--- a/fuchsia/BUILD.gn
+++ b/fuchsia/BUILD.gn
@@ -3,6 +3,7 @@
 # found in the LICENSE file.
 #
 
+import("//build/build_id.gni")
 import("//build/components.gni")
 
 declare_args() {
@@ -64,6 +65,10 @@
       "$va_install_root/lib/libva-magma.so.2",
       "$va_install_root/lib/libigdgmm.so.11",
       "$va_install_root/iHD_drv_video.so",
+      "$va_install_root/lib/libva.so.2.debug",
+      "$va_install_root/lib/libva-magma.so.2.debug",
+      "$va_install_root/lib/libigdgmm.so.11.debug",
+      "$va_install_root/iHD_drv_video.so.debug",
     ]
 
     fuchsia_dir = rebase_path("$root_build_dir/../..")
@@ -89,6 +94,30 @@
   }
 }
 
+build_id_entry("libva_build_id") {
+  stripped = "$va_install_root/lib/libva.so.2"
+  debug = "$va_install_root/lib/libva.so.2.debug"
+  deps = [ ":out-of-tree-build" ]
+}
+
+build_id_entry("libva_magma_build_id") {
+  stripped = "$va_install_root/lib/libva-magma.so.2"
+  debug = "$va_install_root/lib/libva-magma.so.2.debug"
+  deps = [ ":out-of-tree-build" ]
+}
+
+build_id_entry("libigdgmm_build_id") {
+  stripped = "$va_install_root/lib/libigdgmm.so.11"
+  debug = "$va_install_root/lib/libigdgmm.so.11.debug"
+  deps = [ ":out-of-tree-build" ]
+}
+
+build_id_entry("iHD_build_id") {
+  stripped = "$va_install_root/iHD_drv_video.so"
+  debug = "$va_install_root/iHD_drv_video.so.debug"
+  deps = [ ":out-of-tree-build" ]
+}
+
 group("va-intel") {
   public_deps = [
     ":gmmlib-resource",
@@ -96,5 +125,11 @@
     ":va-intel-resource",
     ":va-magma",
   ]
-  deps = [ ":out-of-tree-build" ]
+  deps = [
+    ":iHD_build_id",
+    ":libigdgmm_build_id",
+    ":libva_build_id",
+    ":libva_magma_build_id",
+    ":out-of-tree-build",
+  ]
 }

fuchsia/gendepsfile.py

diff --git a/fuchsia/gendepsfile.py b/fuchsia/gendepsfile.py
index c0832fc..9d5936b 100755
--- a/fuchsia/gendepsfile.py
+++ b/fuchsia/gendepsfile.py
@@ -25,11 +25,15 @@
 
     va_install_dir = "build-intel-media-driver/install"
 
-    print("DEPSFILE", args.depsfile)
+    output_files = [
+        "lib/libva.so.2", "lib/libva-magma.so.2", "lib/libigdgmm.so.11",
+        "iHD_drv_video.so"
+    ]
+
+    debug_output_files = [x + ".debug " for x in output_files]
 
     with open(args.depsfile, "w") as depsfile:
-        for output_file in ["lib/libva.so.2", "lib/libva-magma.so.2",
-                            "lib/libigdgmm.so.11", "iHD_drv_video.so"]:
+        for output_file in output_files + debug_output_files:
             depsfile.write(os.path.join(va_install_dir, output_file) + ": ")
             depsfile.write(" ".join(x.replace(' ', '\\ ') for x in file_lines))
             depsfile.write("\n")