From 5ff4a595c45bbcdfac2697605823b56d4197fb02 Mon Sep 17 00:00:00 2001
From: Xin Li <delphij@google.com>
Date: Mon, 31 Jul 2023 09:32:16 -0700
Subject: DO NOT MERGE ANYWHERE - Update ub-tools-master to use main branch.

Bug: b/289400079
Change-Id: If934a8be324d3e38cbd9e904950932a815c7401f
---
 default.xml | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/default.xml b/default.xml
index 03254460f..4bfa3a2c8 100644
--- a/default.xml
+++ b/default.xml
@@ -4,7 +4,7 @@
   <remote  name="aosp"
            fetch=".."
            review="https://android-review.googlesource.com/" />
-  <default revision="master"
+  <default revision="main"
            remote="aosp"
            sync-j="4" />
 
@@ -33,17 +33,17 @@
   <project path="tools/studio/google/play" name="platform/tools/studio/google/play" />
   <project path="tools/swt" name="platform/tools/swt" />
 
-  <!-- these projects use the master branch -->
-  <project path="external/ant-glob" name="platform/external/ant-glob" revision="master" />
-  <project path="external/eclipse-windowbuilder" name="platform/external/eclipse-windowbuilder" revision="master" />
-  <project path="external/emma" name="platform/external/emma" revision="master"/>
-  <project path="external/gtest" name="platform/external/gtest" revision="master" />
-  <project path="prebuilts/clang/darwin-x86/host/3.5" name="platform/prebuilts/clang/darwin-x86/host/3.5" revision="master" />
-  <project path="prebuilts/eclipse-build-deps" name="platform/prebuilts/eclipse-build-deps" revision="master" />
-  <project path="prebuilts/eclipse-build-deps-sources" name="platform/prebuilts/eclipse-build-deps-sources" revision="master" />
-  <project path="prebuilts/eclipse" name="platform/prebuilts/eclipse" revision="master"/>
-  <project path="prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.11-4.8" name="platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.11-4.8" revision="master" />
-  <project path="prebuilts/gcc/linux-x86/host/x86_64-w64-mingw32-4.8" name="platform/prebuilts/gcc/linux-x86/host/x86_64-w64-mingw32-4.8" revision="master" />
-  <project path="prebuilts/qemu-kernel" name="platform/prebuilts/qemu-kernel" revision="master" />
-  <project path="tools/external/gradle" name="platform/tools/external/gradle" revision="master"/>
+  <!-- these projects use the main branch -->
+  <project path="external/ant-glob" name="platform/external/ant-glob" revision="main" />
+  <project path="external/eclipse-windowbuilder" name="platform/external/eclipse-windowbuilder" revision="main" />
+  <project path="external/emma" name="platform/external/emma" revision="main"/>
+  <project path="external/gtest" name="platform/external/gtest" revision="main" />
+  <project path="prebuilts/clang/darwin-x86/host/3.5" name="platform/prebuilts/clang/darwin-x86/host/3.5" revision="main" />
+  <project path="prebuilts/eclipse-build-deps" name="platform/prebuilts/eclipse-build-deps" revision="main" />
+  <project path="prebuilts/eclipse-build-deps-sources" name="platform/prebuilts/eclipse-build-deps-sources" revision="main" />
+  <project path="prebuilts/eclipse" name="platform/prebuilts/eclipse" revision="main"/>
+  <project path="prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.11-4.8" name="platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.11-4.8" revision="main" />
+  <project path="prebuilts/gcc/linux-x86/host/x86_64-w64-mingw32-4.8" name="platform/prebuilts/gcc/linux-x86/host/x86_64-w64-mingw32-4.8" revision="main" />
+  <project path="prebuilts/qemu-kernel" name="platform/prebuilts/qemu-kernel" revision="main" />
+  <project path="tools/external/gradle" name="platform/tools/external/gradle" revision="main"/>
 </manifest>
-- 
cgit v1.2.3