Update QEMU 8 to add virglrenderer support. am: cebfcd618a
Original change: https://android-review.googlesource.com/c/device/google/cuttlefish_vmm/+/2836857
Change-Id: I62608293fe27d28d00a3085301a9917238689184
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/Android.bp b/Android.bp
index f3da432..5142f62 100644
--- a/Android.bp
+++ b/Android.bp
@@ -129,6 +129,13 @@
check_elf_files: false,
}
cc_prebuilt_binary {
+ name: "x86_64_linux_gnu_libepoxy.so.0_binary_for_qemu",
+ srcs: ["qemu/x86_64-linux-gnu/bin/libepoxy.so.0"],
+ stem: "libepoxy.so.0",
+ defaults: ["cuttlefish_host"],
+ check_elf_files: false,
+}
+cc_prebuilt_binary {
name: "x86_64_linux_gnu_libepoxy.so.0_for_crosvm",
srcs: ["x86_64-linux-gnu/bin/libepoxy.so.0"],
stem: "libepoxy.so.0",
@@ -183,6 +190,13 @@
check_elf_files: false,
}
cc_prebuilt_binary {
+ name: "x86_64_linux_gnu_libvirglrenderer.so.1_binary_for_qemu",
+ srcs: ["qemu/x86_64-linux-gnu/bin/libvirglrenderer.so.1"],
+ stem: "libvirglrenderer.so.1",
+ defaults: ["cuttlefish_host"],
+ check_elf_files: false,
+}
+cc_prebuilt_binary {
name: "x86_64_linux_gnu_libvirglrenderer.so.1_for_crosvm",
srcs: ["x86_64-linux-gnu/bin/libvirglrenderer.so.1"],
stem: "libvirglrenderer.so.1",
diff --git a/qemu/x86_64-linux-gnu/bin/libepoxy.so.0 b/qemu/x86_64-linux-gnu/bin/libepoxy.so.0
new file mode 100755
index 0000000..a61cbc4
--- /dev/null
+++ b/qemu/x86_64-linux-gnu/bin/libepoxy.so.0
Binary files differ
diff --git a/qemu/x86_64-linux-gnu/bin/libgfxstream_backend.so.0 b/qemu/x86_64-linux-gnu/bin/libgfxstream_backend.so.0
index 44455ac..5e02864 100755
--- a/qemu/x86_64-linux-gnu/bin/libgfxstream_backend.so.0
+++ b/qemu/x86_64-linux-gnu/bin/libgfxstream_backend.so.0
Binary files differ
diff --git a/qemu/x86_64-linux-gnu/bin/librutabaga_gfx_ffi.so.0 b/qemu/x86_64-linux-gnu/bin/librutabaga_gfx_ffi.so.0
index 23f0eea..8d190b0 100755
--- a/qemu/x86_64-linux-gnu/bin/librutabaga_gfx_ffi.so.0
+++ b/qemu/x86_64-linux-gnu/bin/librutabaga_gfx_ffi.so.0
Binary files differ
diff --git a/qemu/x86_64-linux-gnu/bin/libvirglrenderer.so.1 b/qemu/x86_64-linux-gnu/bin/libvirglrenderer.so.1
new file mode 100755
index 0000000..591ce5d
--- /dev/null
+++ b/qemu/x86_64-linux-gnu/bin/libvirglrenderer.so.1
Binary files differ
diff --git a/qemu/x86_64-linux-gnu/bin/qemu-edid b/qemu/x86_64-linux-gnu/bin/qemu-edid
index 90eea7a..75a5648 100755
--- a/qemu/x86_64-linux-gnu/bin/qemu-edid
+++ b/qemu/x86_64-linux-gnu/bin/qemu-edid
Binary files differ
diff --git a/qemu/x86_64-linux-gnu/bin/qemu-ga b/qemu/x86_64-linux-gnu/bin/qemu-ga
index 7017208..080c1c1 100755
--- a/qemu/x86_64-linux-gnu/bin/qemu-ga
+++ b/qemu/x86_64-linux-gnu/bin/qemu-ga
Binary files differ
diff --git a/qemu/x86_64-linux-gnu/bin/qemu-img b/qemu/x86_64-linux-gnu/bin/qemu-img
index e63f737..937a248 100755
--- a/qemu/x86_64-linux-gnu/bin/qemu-img
+++ b/qemu/x86_64-linux-gnu/bin/qemu-img
Binary files differ
diff --git a/qemu/x86_64-linux-gnu/bin/qemu-io b/qemu/x86_64-linux-gnu/bin/qemu-io
index 3bbc40c..99780ae 100755
--- a/qemu/x86_64-linux-gnu/bin/qemu-io
+++ b/qemu/x86_64-linux-gnu/bin/qemu-io
Binary files differ
diff --git a/qemu/x86_64-linux-gnu/bin/qemu-nbd b/qemu/x86_64-linux-gnu/bin/qemu-nbd
index cb90a78..9f7c662 100755
--- a/qemu/x86_64-linux-gnu/bin/qemu-nbd
+++ b/qemu/x86_64-linux-gnu/bin/qemu-nbd
Binary files differ
diff --git a/qemu/x86_64-linux-gnu/bin/qemu-pr-helper b/qemu/x86_64-linux-gnu/bin/qemu-pr-helper
index 08c3f48..b820598 100755
--- a/qemu/x86_64-linux-gnu/bin/qemu-pr-helper
+++ b/qemu/x86_64-linux-gnu/bin/qemu-pr-helper
Binary files differ
diff --git a/qemu/x86_64-linux-gnu/bin/qemu-storage-daemon b/qemu/x86_64-linux-gnu/bin/qemu-storage-daemon
index d1d26da..540bd4e 100755
--- a/qemu/x86_64-linux-gnu/bin/qemu-storage-daemon
+++ b/qemu/x86_64-linux-gnu/bin/qemu-storage-daemon
Binary files differ
diff --git a/qemu/x86_64-linux-gnu/bin/qemu-system-aarch64 b/qemu/x86_64-linux-gnu/bin/qemu-system-aarch64
index c893ab5..c91c993 100755
--- a/qemu/x86_64-linux-gnu/bin/qemu-system-aarch64
+++ b/qemu/x86_64-linux-gnu/bin/qemu-system-aarch64
Binary files differ
diff --git a/qemu/x86_64-linux-gnu/bin/qemu-system-riscv64 b/qemu/x86_64-linux-gnu/bin/qemu-system-riscv64
index ecc1ae3..bf3940e 100755
--- a/qemu/x86_64-linux-gnu/bin/qemu-system-riscv64
+++ b/qemu/x86_64-linux-gnu/bin/qemu-system-riscv64
Binary files differ
diff --git a/qemu/x86_64-linux-gnu/bin/qemu-system-x86_64 b/qemu/x86_64-linux-gnu/bin/qemu-system-x86_64
index 26c7d18..f9e0d10 100755
--- a/qemu/x86_64-linux-gnu/bin/qemu-system-x86_64
+++ b/qemu/x86_64-linux-gnu/bin/qemu-system-x86_64
Binary files differ
diff --git a/qemu/x86_64-linux-gnu/usr/lib/x86_64-linux-gnu/libfdt.a b/qemu/x86_64-linux-gnu/usr/lib/libfdt.a
similarity index 70%
rename from qemu/x86_64-linux-gnu/usr/lib/x86_64-linux-gnu/libfdt.a
rename to qemu/x86_64-linux-gnu/usr/lib/libfdt.a
index 7059bc1..a61f710 100644
--- a/qemu/x86_64-linux-gnu/usr/lib/x86_64-linux-gnu/libfdt.a
+++ b/qemu/x86_64-linux-gnu/usr/lib/libfdt.a
Binary files differ
diff --git a/qemu/x86_64-linux-gnu/usr/lib/x86_64-linux-gnu/pkgconfig/libfdt.pc b/qemu/x86_64-linux-gnu/usr/lib/pkgconfig/libfdt.pc
similarity index 80%
rename from qemu/x86_64-linux-gnu/usr/lib/x86_64-linux-gnu/pkgconfig/libfdt.pc
rename to qemu/x86_64-linux-gnu/usr/lib/pkgconfig/libfdt.pc
index 8792615..ffdac5a 100644
--- a/qemu/x86_64-linux-gnu/usr/lib/x86_64-linux-gnu/pkgconfig/libfdt.pc
+++ b/qemu/x86_64-linux-gnu/usr/lib/pkgconfig/libfdt.pc
@@ -1,6 +1,6 @@
prefix=/usr
includedir=${prefix}/include
-libdir=${prefix}/lib/x86_64-linux-gnu
+libdir=${prefix}/lib
Name: libfdt
Description: Flat Device Tree manipulation
diff --git a/qemu/x86_64-linux-gnu/usr/libexec/qemu-bridge-helper b/qemu/x86_64-linux-gnu/usr/libexec/qemu-bridge-helper
index 4b63dd1..e4a86ea 100755
--- a/qemu/x86_64-linux-gnu/usr/libexec/qemu-bridge-helper
+++ b/qemu/x86_64-linux-gnu/usr/libexec/qemu-bridge-helper
Binary files differ
diff --git a/qemu/x86_64-linux-gnu/usr/libexec/vhost-user-gpu b/qemu/x86_64-linux-gnu/usr/libexec/vhost-user-gpu
new file mode 100755
index 0000000..18401db
--- /dev/null
+++ b/qemu/x86_64-linux-gnu/usr/libexec/vhost-user-gpu
Binary files differ
diff --git a/qemu/x86_64-linux-gnu/usr/share/qemu/vhost-user/50-qemu-gpu.json b/qemu/x86_64-linux-gnu/usr/share/qemu/vhost-user/50-qemu-gpu.json
new file mode 100644
index 0000000..284519f
--- /dev/null
+++ b/qemu/x86_64-linux-gnu/usr/share/qemu/vhost-user/50-qemu-gpu.json
@@ -0,0 +1,5 @@
+{
+ "description": "QEMU vhost-user-gpu",
+ "type": "gpu",
+ "binary": "/usr/libexec/vhost-user-gpu"
+}
