DO NOT MERGE ANYWHERE - Update emu-master-qemu to use main branch.

Bug: b/289400079
Change-Id: I7e7637505a7ef69675f8649a6902c2d25181a253

default.xml

@@ -1,107 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <manifest>
-  <remote name="aosp" fetch=".." review="https://android-review.googlesource.com/" />
-  <default revision="androidx-javascriptengine-release" remote="aosp" />
-  <project path="build/make" name="platform/build" revision="3349723b6d5616875b552639edcf1afbefe5cb12" upstream="androidx-javascriptengine-release" />
 
-  
-  
-  <project path="external/dexter" name="platform/tools/dexter" clone-depth="1" revision="7bc2c8ccf1db5bd95d471f52ecfe732b5722ff61" upstream="androidx-javascriptengine-release" />
-  <project path="external/noto-fonts" name="platform/external/noto-fonts" clone-depth="1" revision="61449a7b7148cdfc6296dfa86ba2933ee11b4143" upstream="androidx-javascriptengine-release" />
-  <project path="external/webview_support_interfaces" name="platform/external/webview_support_interfaces" clone-depth="1" revision="95fd86b975b04e4bada948635339becf55045201" upstream="androidx-javascriptengine-release" />
-  <project path="external/icing" name="platform/external/icing" clone-depth="1" revision="6d3c030fdfd0dc1d98fe03b9477bd627d4785a3f" upstream="androidx-javascriptengine-release" />
-  <project path="external/icu" name="platform/external/icu" clone-depth="1" revision="304410e63a5426aa480a450f7386b3e1ff240096" upstream="androidx-javascriptengine-release" />
-  <project path="external/sqlite" name="platform/external/sqlite" clone-depth="1" revision="ea82b873876703f67948107f0d59691cea51ebd0" upstream="androidx-javascriptengine-release" />
-  <project path="external/abseil-cpp" name="platform/external/abseil-cpp" clone-depth="1" revision="2a702b70aa88f45d659d276bbb42a9e3b8ee25f8" upstream="androidx-javascriptengine-release" />
-  <project path="external/ink-stroke-modeler" name="platform/external/ink-stroke-modeler" clone-depth="1" revision="6cc88454220223252d5e7cb22fc46518b5595a0e" upstream="androidx-javascriptengine-release" />
-  <project path="external/libyuv" name="platform/external/libyuv" clone-depth="1" revision="817f5ad876a58caa7deab384d0f885de26b384b3" upstream="androidx-javascriptengine-release" />
+  <remote  name="aosp"
+           fetch=".."
+           review="https://android-review.googlesource.com/" />
+  <default revision="emu-master-dev"
+           remote="aosp"
+           sync-j="4" />
 
-  
-  <project path="external/compose-hero-benchmarks/poxedex-compose" name="platform/external/compose-hero-benchmarks/poxedex-compose" clone-depth="1" revision="d162df5fa617eeaf4ae232bf81052098fe6decb1" upstream="androidx-javascriptengine-release" />
+  <project path="build" name="platform/build" />
+  <project path="tools/buildSrc" name="platform/tools/buildSrc" />
 
-  
-  <project path="external/protobuf" name="platform/external/protobuf" clone-depth="1" revision="24a7e90629553667d2c1f5f748e5c5242790f7e5" upstream="androidx-javascriptengine-release" />
-
-  <project path="prebuilts/androidx/chrome-for-testing" name="platform/prebuilts/androidx/chrome-for-testing" clone-depth="1" revision="554ec2c1ece82dcbe358592caf4c86a11ea49e62" upstream="androidx-javascriptengine-release" />
-  <project path="prebuilts/androidx/external" name="platform/prebuilts/androidx/external" clone-depth="1" revision="7cff543c79391eeffdc73932106c62a93ea883a0" upstream="androidx-javascriptengine-release" />
-  <project path="prebuilts/androidx/internal" name="platform/prebuilts/androidx/internal" clone-depth="1" revision="3dafac44ea361ce8a4ee465a31be5266cfe2c03d" upstream="androidx-javascriptengine-release" />
-  <project path="prebuilts/androidx/javascript-for-kotlin" name="platform/prebuilts/androidx/javascript-for-kotlin" clone-depth="1" revision="fc3fd63751b5b6e9e24827dc99d6235c5a54015b" upstream="androidx-javascriptengine-release" />
-  <project path="prebuilts/androidx/exoplayer" name="platform/prebuilts/androidx/exoplayer" clone-depth="1" revision="8759893b15627e09a76140ae550f478c782d3387" upstream="androidx-javascriptengine-release" />
-  <project path="prebuilts/androidx/ink" name="platform/prebuilts/androidx/ink" clone-depth="1" revision="c87bca1c04ccc97281df484ef354226b4ede1469" upstream="androidx-javascriptengine-release" />
-  <project path="prebuilts/androidx/traceprocessor" name="platform/prebuilts/androidx/traceprocessor" clone-depth="1" revision="30ca4d3845714e915a72dcd79304a2229dbc02cd" upstream="androidx-javascriptengine-release" />
-  <project path="prebuilts/androidx/konan" name="platform/prebuilts/androidx/konan" clone-depth="1" revision="e385220a50d6c8909820335e3d7993fbba229169" upstream="androidx-javascriptengine-release" />
-  <project path="prebuilts/androidx/xr" name="platform/prebuilts/androidx/xr" clone-depth="1" revision="4f079529d90a0f0583371cfa4104a3e88ced91c3" upstream="androidx-javascriptengine-release" />
-
-  
-  
-  <project path="tools/metalava" name="platform/tools/metalava" clone-depth="1" revision="04c271d001e7872d0ef216a80c774dca49c48243" upstream="androidx-javascriptengine-release" />
-  
-  <project path="prebuilts/checkstyle" name="platform/prebuilts/checkstyle" clone-depth="1" revision="cf98c774bbb4d744834587b7c6cd3ab2e2bfd708" upstream="androidx-javascriptengine-release" />
-  <project path="tools/repohooks" name="platform/tools/repohooks" clone-depth="1" revision="dfda9bcf07fbab25efe44fe603f6ebe9ed643ea7" upstream="androidx-javascriptengine-release" />
-  <project path="tools/fetch_artifact" name="tools/fetch_artifact" clone-depth="1" revision="741d638b8414c0611355ca7fc1db177f51946f01" upstream="androidx-javascriptengine-release" />
-  
-  <project path="prebuilts/protobuf" name="platform/prebuilts/protobuf" clone-depth="1" revision="1032661b632ef1325de4c4829008dab8571c346e" upstream="androidx-javascriptengine-release" />
-  <project path="prebuilts/build-tools" name="platform/prebuilts/build-tools" clone-depth="1" revision="645a7339a4d59d46aa57f89dd70eeed02d88cacc" upstream="androidx-javascriptengine-release" />
-
-
-  
-  
-  <project path="tools/external/gradle" name="platform/tools/external/gradle" clone-depth="1" revision="a1d59a9a9f6eb7b00a04c183901f3ac788891530" upstream="androidx-javascriptengine-release" />
-
-  
-  <project path="prebuilts/fullsdk-darwin/platforms" name="platform/prebuilts/fullsdk/platforms" clone-depth="1" revision="299e3a1c64506a958c4c487377a9c196b69e3edb" upstream="androidx-javascriptengine-release">
-    <linkfile src="." dest="prebuilts/fullsdk-linux/platforms" />
-  </project>
-  <project path="prebuilts/fullsdk-darwin/sources" name="platform/prebuilts/fullsdk/sources" clone-depth="1" revision="dc3f885ebe8ddc75bd9cf2d567eef4d1ed433a09" upstream="androidx-javascriptengine-release">
-    <linkfile src="." dest="prebuilts/fullsdk-linux/sources" />
+  <project path="device/generic/goldfish-opengl" name="device/generic/goldfish-opengl" revision="main"/>
+  <project path="device/generic/vulkan-cereal" name="device/generic/vulkan-cereal" revision="main"/>
+  <project path="external/adt-infra" name="platform/external/adt-infra" />
+  <project path="external/astc-codec" name="platform/external/astc-codec" revision="main" />
+  <project path="external/boringssl" name="platform/external/boringssl" revision="main" clone-depth="1"/>
+  <project path="external/cares" name="platform/external/c-ares" />
+  <project path="external/curl" name="platform/external/curl" />
+  <project path="external/deqp" name="platform/external/deqp" revision="main" />
+  <project path="external/googletest" name="platform/external/googletest" revision="main" />
+  <project path="external/google-benchmark" name="platform/external/google-benchmark" revision="db1632fadc79df388a2a7248157c965ee40248a1" />
+  <project path="external/google-breakpad" name="platform/external/google-breakpad" />
+  <project path="external/grpc" name="platform/external/grpc-grpc" />
+  <project path="external/libusb" name="platform/external/libusb" />
+  <project path="external/libyuv" name="platform/external/libyuv" />
+  <project path="external/libpng" name="platform/external/libpng" />
+  <project path="external/lz4" name="platform/external/lz4" />
+  <project path="external/protobuf" name="platform/external/protobuf" />
+  <project path="external/perfetto" name="platform/external/perfetto" revision="37518c39e3db120322359090db3d54f6ac100078"/>
+  <project path="external/qemu" name="platform/external/qemu">
+    <copyfile src="android/vscode/emu.code-workspace" dest="emu.code-workspace"/>
   </project>
+  <project path="external/tinyobjloader" name="platform/external/tinyobjloader" revision="main"/>
+  <project path="external/virglrenderer" name="platform/external/virglrenderer" revision="crosvm-master"/>
+  <project path="external/nasm" name="platform/external/nasm" />
+  <project path="external/wpa_supplicant_8" name="platform/external/wpa_supplicant_8" />
+  <project path="external/zlib" name="platform/external/zlib" />
+  <project path="frameworks/native" name="platform/frameworks/native" revision="lollipop-release" />
+  <project path="prebuilts/android-emulator" name="platform/prebuilts/android-emulator" clone-depth="1" />
+  <project path="prebuilts/android-emulator-build/archive" name="platform/prebuilts/android-emulator-build/archive" clone-depth="1" />
+  <project path="prebuilts/android-emulator-build/common" name="platform/prebuilts/android-emulator-build/common" clone-depth="1" />
+  <project path="prebuilts/android-emulator-build/mesa" name="platform/prebuilts/android-emulator-build/mesa" clone-depth="1" />
+  <project path="prebuilts/android-emulator-build/mesa-deps" name="platform/prebuilts/android-emulator-build/mesa-deps" clone-depth="1" />
+  <project path="prebuilts/android-emulator-build/qemu-android-deps" name="platform/prebuilts/android-emulator-build/qemu-android-deps" clone-depth="1" />
+  <project path="prebuilts/android-emulator-build/qt" name="platform/prebuilts/android-emulator-build/qt" clone-depth="1" />
 
-  
-  <project path="prebuilts/fullsdk-darwin/build-tools" name="platform/prebuilts/fullsdk-darwin/build-tools" clone-depth="1" groups="notdefault,platform-darwin" revision="7540faf0c99f587e09526916f2663bc0342c0724" upstream="androidx-javascriptengine-release" />
-  <project path="prebuilts/fullsdk-darwin/cmdline-tools" name="platform/prebuilts/fullsdk-darwin/cmdline-tools" clone-depth="1" groups="notdefault,platform-darwin" revision="259b6a33db4ae6e34ce4121c79b48b222f9815ff" upstream="androidx-javascriptengine-release" />
-  <project path="prebuilts/fullsdk-darwin/platform-tools" name="platform/prebuilts/fullsdk-darwin/platform-tools" clone-depth="1" groups="notdefault,platform-darwin" revision="b20a481fa8e4c6886536f090e688bdcd8b51135f" upstream="androidx-javascriptengine-release" />
-  <project path="prebuilts/fullsdk-darwin/tools" name="platform/prebuilts/fullsdk-darwin/tools" clone-depth="1" groups="notdefault,platform-darwin" revision="204b8813ffedef10214a4afe04c843f1ee9e4fe7" upstream="androidx-javascriptengine-release" />
+  <project path="prebuilts/clang/host/darwin-x86" name="platform/prebuilts/clang/host/darwin-x86" clone-depth="1" revision="main" />
+  <project path="prebuilts/clang/host/linux-x86" name="platform/prebuilts/clang/host/linux-x86" clone-depth="1" revision="main" />
+  <project path="prebuilts/clang/host/windows-x86" name="platform/prebuilts/clang/host/windows-x86" clone-depth="1" revision="main" />
+  <project path="prebuilts/cmake/darwin-x86" name="platform/prebuilts/cmake/darwin-x86" clone-depth="1" />
+  <project path="prebuilts/cmake/linux-x86" name="platform/prebuilts/cmake/linux-x86" clone-depth="1" />
+  <project path="prebuilts/cmake/windows-x86" name="platform/prebuilts/cmake/windows-x86" clone-depth="1" />
+  <project path="prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.17-4.8" name="platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.17-4.8" clone-depth="1" revision="main" />
+  <project path="prebuilts/ninja/darwin-x86" name="platform/prebuilts/ninja/darwin-x86" clone-depth="1" />
+  <project path="prebuilts/ninja/linux-x86" name="platform/prebuilts/ninja/linux-x86" clone-depth="1" />
+  <project path="prebuilts/qemu-kernel" name="platform/prebuilts/qemu-kernel" clone-depth="1" revision="main" />
+  <project path="prebuilts/tools" name="platform/prebuilts/tools" clone-depth="1" revision="main" />
+  <project path="sdk" name="platform/sdk" />
+  <project path="tools/emulator" name="platform/tools/emulator" />
+  <project path="tools/acloud" name="platform/tools/acloud" revision="main" />
+  <project name="device/google/cuttlefish" path="device/google/cuttlefish" revision="main"/>
 
-  
-  <project path="prebuilts/fullsdk-linux/build-tools" name="platform/prebuilts/fullsdk-linux/build-tools" clone-depth="1" groups="notdefault,platform-linux" revision="5d7b781b0367b83e6249396cbd4f9fab0a5313f0" upstream="androidx-javascriptengine-release" />
-  <project path="prebuilts/fullsdk-linux/cmdline-tools" name="platform/prebuilts/fullsdk-linux/cmdline-tools" clone-depth="1" groups="notdefault,platform-linux" revision="066e40b1aba006cf95698c9d34a5c50ff992f5d8" upstream="androidx-javascriptengine-release" />
-  <project path="prebuilts/fullsdk-linux/platform-tools" name="platform/prebuilts/fullsdk-linux/platform-tools" clone-depth="1" groups="notdefault,platform-linux" revision="ba0f1a9419bf13c00c029208e3c728d72dc17862" upstream="androidx-javascriptengine-release" />
-  <project path="prebuilts/fullsdk-linux/tools" name="platform/prebuilts/fullsdk-linux/tools" clone-depth="1" groups="notdefault,platform-linux" revision="2d5e66a40bd1e6d43ee458efea6f1dd5d5166a59" upstream="androidx-javascriptengine-release" />
+  <!-- Bring in the root-canal, bluetooth dependencies -->
+  <project path="system/bt" name="platform/system/bt"  groups="pdk" revision="main"/>
+  <project path="external/libchrome" name="platform/external/libchrome" groups="pdk" revision="emu-master-dev"/>
 
+  <!-- toolchain requirements for root-canal -->
+  <project path="external/bison" name="platform/external/bison" groups="pdk" revision="main"/>
+  <project path="external/flex" name="platform/external/flex" groups="pdk" revision="main"/>
+  <project path="external/m4" name="toolchain/m4" groups="pdk" revision="main"/>
 
-  
-  
-  <project path="prebuilts/fullsdk-darwin/ndk-bundle" name="toolchain/prebuilts/ndk-darwin/r27" revision="ca75344ceaacb4e90888371aa3b640d8f4fbcfa8" clone-depth="1" groups="notdefault,platform-darwin" upstream="androidx-javascriptengine-release" />
-  <project path="prebuilts/fullsdk-darwin/cmake" name="platform/prebuilts/cmake/darwin-x86" groups="notdefault,platform-darwin" clone-depth="1" revision="7aea7e9880110799088cd1de509886871078306f" upstream="androidx-javascriptengine-release">
-    <linkfile src="bin/cmake" dest="prebuilts/fullsdk-darwin/native-build-tools/bin/cmake" />
-  </project>
-  <project path="prebuilts/fullsdk-darwin/ninja" name="platform/prebuilts/ninja/darwin-x86" groups="notdefault,platform-darwin" clone-depth="1" revision="5bee7476abca3c2636af60438fb140dcd14c8674" upstream="androidx-javascriptengine-release">
-    <linkfile src="ninja" dest="prebuilts/fullsdk-darwin/native-build-tools/bin/ninja" />
-  </project>
-  <project path="prebuilts/fullsdk-linux/ndk-bundle" name="toolchain/prebuilts/ndk/r27" clone-depth="1" groups="notdefault,platform-linux" revision="77eba0d553f8f58557f99fa98f327eb5f46e0c8c" upstream="androidx-javascriptengine-release" />
-  <project path="prebuilts/fullsdk-linux/cmake" name="platform/prebuilts/cmake/linux-x86" groups="notdefault,platform-linux" clone-depth="1" revision="e57c88d59d7d8408a32b16425158fd2aa64e2b3e" upstream="androidx-javascriptengine-release">
-    <linkfile src="bin/cmake" dest="prebuilts/fullsdk-linux/native-build-tools/bin/cmake" />
-  </project>
-  <project path="prebuilts/fullsdk-linux/ninja" name="platform/prebuilts/ninja/linux-x86" groups="notdefault,platform-linux" clone-depth="1" revision="8b6456a781f2f178fade96e3d8d9234e73e9f817" upstream="androidx-javascriptengine-release">
-    <linkfile src="ninja" dest="prebuilts/fullsdk-linux/native-build-tools/bin/ninja" />
-  </project>
-  
-  
-  
-  <project path="prebuilts/jdk/jdk17" name="platform/prebuilts/jdk/jdk17" clone-depth="1" revision="f6e0a88cff84fd57741fc671208ba0326f036c8e" upstream="androidx-javascriptengine-release" />
-  <project path="prebuilts/jdk/jdk21" name="platform/prebuilts/jdk/jdk21" clone-depth="1" revision="74744435645bc33cfbeb3187d1550ded2f61a55f" upstream="androidx-javascriptengine-release" />
-  
-  
-  <project path="golden" name="platform/frameworks/support-golden" clone-depth="1" revision="bd168a79f884933dbc585932b2d4c13df378b542" upstream="androidx-javascriptengine-release" />
-
-  
-
-  
-  <project path="frameworks/support" name="platform/frameworks/support" revision="87de50e190d7e843166cedd9df75192e999fe84b" upstream="androidx-javascriptengine-release" />
-  
-
-  <repo-hooks in-project="platform/tools/repohooks" enabled-list="pre-upload" />
-
-  
-  
-  
-</manifest>
+  <!-- Webrtc for the goldfish-webrtc-videobridge -->
+  <project path="external/webrtc" name="platform/external/webrtc" />
+</manifest>