From e1cd89d9a019e10a7daa5014104988e526625db2 Mon Sep 17 00:00:00 2001
From: Xin Li <delphij@google.com>
Date: Mon, 31 Jul 2023 09:31:57 -0700
Subject: DO NOT MERGE ANYWHERE - Update emu-master-qemu to use main branch.

Bug: b/289400079
Change-Id: I7e7637505a7ef69675f8649a6902c2d25181a253
---
 default.xml | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/default.xml b/default.xml
index 322662d3f..30faaf340 100644
--- a/default.xml
+++ b/default.xml
@@ -11,15 +11,15 @@
   <project path="build" name="platform/build" />
   <project path="tools/buildSrc" name="platform/tools/buildSrc" />
 
-  <project path="device/generic/goldfish-opengl" name="device/generic/goldfish-opengl" revision="master"/>
-  <project path="device/generic/vulkan-cereal" name="device/generic/vulkan-cereal" revision="master"/>
+  <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="master" />
-  <project path="external/boringssl" name="platform/external/boringssl" revision="master" clone-depth="1"/>
+  <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="master" />
-  <project path="external/googletest" name="platform/external/googletest" revision="master" />
+  <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" />
@@ -32,7 +32,7 @@
   <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="master"/>
+  <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" />
@@ -46,30 +46,30 @@
   <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/clang/host/darwin-x86" name="platform/prebuilts/clang/host/darwin-x86" clone-depth="1" revision="master" />
-  <project path="prebuilts/clang/host/linux-x86" name="platform/prebuilts/clang/host/linux-x86" clone-depth="1" revision="master" />
-  <project path="prebuilts/clang/host/windows-x86" name="platform/prebuilts/clang/host/windows-x86" clone-depth="1" revision="master" />
+  <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="master" />
+  <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="master" />
-  <project path="prebuilts/tools" name="platform/prebuilts/tools" clone-depth="1" revision="master" />
+  <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="master" />
-  <project name="device/google/cuttlefish" path="device/google/cuttlefish" revision="master"/>
+  <project path="tools/acloud" name="platform/tools/acloud" revision="main" />
+  <project name="device/google/cuttlefish" path="device/google/cuttlefish" revision="main"/>
 
   <!-- Bring in the root-canal, bluetooth dependencies -->
-  <project path="system/bt" name="platform/system/bt"  groups="pdk" revision="master"/>
+  <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="master"/>
-  <project path="external/flex" name="platform/external/flex" groups="pdk" revision="master"/>
-  <project path="external/m4" name="toolchain/m4" groups="pdk" revision="master"/>
+  <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"/>
 
   <!-- Webrtc for the goldfish-webrtc-videobridge -->
   <project path="external/webrtc" name="platform/external/webrtc" />
-- 
cgit v1.2.3