Add libgbm to the host package. am: ca4aef4c08 am: fd2a651942

Original change: https://android-review.googlesource.com/c/device/google/cuttlefish_vmm/+/2892462

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

3 files changed, 8 insertions, 0 deletions

diff --git a/Android.bp b/Android.bp
index f76e01c..b0605f7 100644
--- a/Android.bp
+++ b/Android.bp
@@ -168,6 +168,13 @@ cc_prebuilt_binary {
   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",
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 @@ def build_task_for_qemu_portable(build: BuildConfig):
   )
   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",
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