Merge "Upvert gfxstream." into main am: 6adf02b906 am: e758188fd1 am: cf796387bb am: 41790639df

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

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

3 files changed, 17 insertions, 7 deletions

diff --git a/qemu/manifest.xml b/qemu/manifest.xml
index bdba2b1..915f055 100644
--- a/qemu/manifest.xml
+++ b/qemu/manifest.xml
@@ -9,16 +9,17 @@
   <project path="qemu/prebuilts/gcc" name="platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.17-4.8" revision="f7b0d5b0ee369864d5ac3e96ae24ec9e2b6a52da" clone-depth="1" />
   <project path="qemu/prebuilts/ninja" name="platform/prebuilts/ninja/linux-x86" revision="8a10824f74fe0e22af9bf314a837f5b70e2bb67f" clone-depth="1" />
   <project path="qemu/prebuilts/rust" name="platform/prebuilts/rust" revision="420a45125a091ddc1bd09b4c6fb39306fdc0c5b5" clone-depth="1" />
-  <project path="qemu/third_party/aemu" name="platform/hardware/google/aemu" revision="c6d126587b36707f6e041ee41f3f9e7213c0cf0a" />
+  <project path="qemu/third_party/aemu" name="platform/hardware/google/aemu" revision="d6e6b99ba6ec2b6b2502aa46dcb57d6b0fa53787" />
   <project path="qemu/third_party/bzip2" name="platform/external/bzip2" revision="af971b5524a392944a8fd1423b1860f3ab2919ec" />
-  <project path="qemu/third_party/crosvm" name="platform/external/crosvm" revision="aac1641f1ca541cb13941396f08474db590deea7" />
+  <project path="qemu/third_party/crosvm" name="platform/external/crosvm" revision="c0512454405e854140a8d86a31a455d7946b50ee" />
   <project path="qemu/third_party/crosvm/third_party/virglrenderer" name="platform/external/virglrenderer" revision="4770f706db2d0e7731264cb36a659c764c7787f1" />
   <project path="qemu/third_party/egl" name="platform/external/egl-registry" revision="9ab603608d6b165f79f17eee9ee1ced861625893" />
   <project path="qemu/third_party/flatbuffers" name="platform/external/flatbuffers" revision="baf9b3a15e291a0c76850a50f994c5947c3f5e5e" />
-  <project path="qemu/third_party/gfxstream" name="platform/hardware/google/gfxstream" revision="8a105d876b234453ee1aa64a1e127c3259b6a58a" />
+  <project path="qemu/third_party/gfxstream" name="platform/hardware/google/gfxstream" revision="d2f579544f1562b9ee7270ac56afa254edb0f815" />
   <project path="qemu/third_party/glib" name="platform/external/bluetooth/glib" revision="180713772f4e7bcdddf2c793f2f34a498184ed15" />
   <project path="qemu/third_party/glib/subprojects/gvdb" name="platform/external/gvdb" revision="0854af0fdb6d527a8d1999835ac2c5059976c210" />
   <project path="qemu/third_party/googletest" name="platform/external/googletest" revision="276e32ec333e05bff6dc7d20218a8d9152623222">
+    <linkfile src="." dest="qemu/third_party/qemu/roms/edk2/MdePkg/Library/MipiSysTLib/mipisyst/external/googletest" />
     <linkfile src="." dest="qemu/third_party/qemu/roms/edk2/UnitTestFrameworkPkg/Library/GoogleTestLib/googletest" />
   </project>
   <project path="qemu/third_party/libdrm" name="platform/external/libdrm" revision="ed0a0cde4ea44f6295786900a9f42afd78713677" />
@@ -56,5 +57,4 @@
   <project path="qemu/third_party/rust/crates/zerocopy" name="platform/external/rust/crates/zerocopy" revision="e28011fefae1a9014f99b01e95a8dbc0ce838206" />
   <project path="qemu/third_party/rust/crates/zerocopy-derive" name="platform/external/rust/crates/zerocopy-derive" revision="b93d75504c6840e116d1d36809ef24a1087e071d" />
   <project path="qemu/third_party/zlib" name="platform/external/zlib" revision="81774276a9cbf47177a1b7555bb6e3ec73bdcd25" />
-</manifest>
-
+</manifest>
\ No newline at end of file
diff --git a/qemu/scripts/genrepo.py b/qemu/scripts/genrepo.py
index 2d653db..8654c2a 100644
--- a/qemu/scripts/genrepo.py
+++ b/qemu/scripts/genrepo.py
@@ -58,6 +58,12 @@ REPO_TO_SKIP = {
     "https://github.com/tianocore/edk2-cmocka.git",
     "https://github.com/ucb-bar/berkeley-softfloat-3.git",
     "https://gitlab.com/libvirt/libvirt-ci.git",
+    "https://github.com/gost-engine/engine",
+    "https://github.com/provider-corner/libprov.git",
+    "https://github.com/MIPI-Alliance/public-mipi-sys-t.git",
+    "https://github.com/Zeex/subhook.git",
+    "https://github.com/zeux/pugixml.git",
+    "https://github.com/devicetree-org/pylibfdt.git",
     "https://gitlab.com/qemu-project/edk2.git",
     "https://gitlab.com/qemu-project/ipxe.git",
     "https://gitlab.com/qemu-project/libvfio-user.git",
diff --git a/qemu/scripts/rebuild.py b/qemu/scripts/rebuild.py
index 450bc3f..4192f26 100755
--- a/qemu/scripts/rebuild.py
+++ b/qemu/scripts/rebuild.py
@@ -857,7 +857,11 @@ def build_task_for_rutabaga(build: BuildConfig):
   build.run(cmd_args, rutabaga_src_dir, env)
   build.copy_file(
       out_dir / "release" / "librutabaga_gfx_ffi.so",
-      build.install_dir / "usr" / "lib" / "librutabaga_gfx_ffi.so.0",
+      build.install_dir / "usr" / "lib" / "librutabaga_gfx_ffi.so",
+  )
+  build.run(
+      [ "ln", "-sf", "librutabaga_gfx_ffi.so", "librutabaga_gfx_ffi.so.0"],
+      build.install_dir / "usr" / "lib"
   )
   build.copy_file(
       rutabaga_src_dir / "src" / "share" / "rutabaga_gfx_ffi.pc",
@@ -919,7 +923,7 @@ def build_task_for_qemu_portable(build: BuildConfig):
 
   files = [
       "dest-install/usr/lib/libz.so.1",
-      "dest-install/usr/lib/librutabaga_gfx_ffi.so",
+      "dest-install/usr/lib/librutabaga_gfx_ffi.so.0",
       "dest-install/usr/lib/libgfxstream_backend.so",
       "dest-install/usr/lib/libc++.so.1",
   ]