commit ca4aef4c087a572d31a123109a498fb33f326eba
author Pierre Labatut <plabatut@google.com> Tue Dec 19 16:14:01 2023 +0100
committer Pierre Labatut <plabatut@google.com> Tue Jan 02 09:56:46 2024 +0000
tree 9e1b7802e3fcefb2c0c384cef900ef9dc21c111a
parent 8e47943ac88e45839b7e01d03f0bf8e12cbca2be

Add libgbm to the host package.

Bug: b/315482378
Change-Id: I53278300968ae77c65402678b3c400029dc9e473

Android.bp

diff --git a/Android.bp b/Android.bp
index f76e01c..b0605f7 100644
--- a/Android.bp
+++ b/Android.bp
@@ -168,6 +168,13 @@
   check_elf_files: false,
 }
 cc_prebuilt_binary {
+  name: "x86_64_linux_gnu_libgbm.so.1_binary_for_qemu",
+  srcs: ["qemu/x86_64-linux-gnu/bin/libgbm.so.1"],
+  stem: "libgbm.so.1",
+  defaults: ["cuttlefish_host"],
+  check_elf_files: false,
+}
+cc_prebuilt_binary {
   name: "x86_64_linux_gnu_libgbm.so.1_for_crosvm",
   srcs: ["x86_64-linux-gnu/bin/libgbm.so.1"],
   stem: "libgbm.so.1",

qemu/scripts/rebuild.py

diff --git a/qemu/scripts/rebuild.py b/qemu/scripts/rebuild.py
index a23bcbd..115adf8 100755
--- a/qemu/scripts/rebuild.py
+++ b/qemu/scripts/rebuild.py
@@ -1048,6 +1048,7 @@
   )
   bin_dir = package_dir / "bin"
   files = [
+      "dest-install/usr/lib/libgbm.so.1",
       "dest-install/usr/lib/libz.so.1",
       "dest-install/usr/lib/libepoxy.so.0",
       "dest-install/usr/lib/libvirglrenderer.so.1",

qemu/x86_64-linux-gnu/bin/libgbm.so.1

diff --git a/qemu/x86_64-linux-gnu/bin/libgbm.so.1 b/qemu/x86_64-linux-gnu/bin/libgbm.so.1
new file mode 100755
index 0000000..f7d504b
--- /dev/null
+++ b/qemu/x86_64-linux-gnu/bin/libgbm.so.1
Binary files differ