DO NOT MERGE ANYWHERE - Update androidx-main to use main branch.

Bug: b/289400079
Change-Id: Iedec833dac3d33450525887397a63abb9b8e69fa

1 files changed, 21 insertions, 21 deletions

diff --git a/default.xml b/default.xml
index cb4cc8887..cc7b4e6e2 100644
--- a/default.xml
+++ b/default.xml
@@ -26,17 +26,17 @@
   <project path="prebuilts/androidx/traceprocessor" name="platform/prebuilts/androidx/traceprocessor" clone-depth="1" />
   <project path="prebuilts/androidx/konan" name="platform/prebuilts/androidx/konan" clone-depth="1" />
 
-  <!-- Config: shallow + master revision -->
-  <project path="external/abseil-cpp" name="platform/external/abseil-cpp" clone-depth="1" revision="master" />
-  <project path="external/dokka" name="platform/external/dokka" clone-depth="1" revision="master" />
-  <project path="external/ink-stroke-modeler" name="platform/external/ink-stroke-modeler" clone-depth="1" revision="master" />
-  <project path="external/libyuv" name="platform/external/libyuv" clone-depth="1" revision="master" />
+  <!-- Config: shallow + main revision -->
+  <project path="external/abseil-cpp" name="platform/external/abseil-cpp" clone-depth="1" revision="main" />
+  <project path="external/dokka" name="platform/external/dokka" clone-depth="1" revision="main" />
+  <project path="external/ink-stroke-modeler" name="platform/external/ink-stroke-modeler" clone-depth="1" revision="main" />
+  <project path="external/libyuv" name="platform/external/libyuv" clone-depth="1" revision="main" />
 
   <!-- Tools dependencies -->
-  <!-- Config: shallow + master revision -->
-  <project path="prebuilts/checkstyle" name="platform/prebuilts/checkstyle" clone-depth="1" revision="master" />
-  <project path="tools/repohooks" name="platform/tools/repohooks" clone-depth="1" revision="master" />
-  <project path="tools/fetch_artifact" name="tools/fetch_artifact" clone-depth="1" revision="master" />
+  <!-- Config: shallow + main revision -->
+  <project path="prebuilts/checkstyle" name="platform/prebuilts/checkstyle" clone-depth="1" revision="main" />
+  <project path="tools/repohooks" name="platform/tools/repohooks" clone-depth="1" revision="main" />
+  <project path="tools/fetch_artifact" name="tools/fetch_artifact" clone-depth="1" revision="main" />
   <project path="tools/metalava" name="platform/tools/metalava" clone-depth="1" revision="metalava-main" />
   <!-- Config: shallow + same revision -->
   <!-- The contents of external/protobuf must be kept in sync with the contents of prebuilts/protobuf -->
@@ -51,14 +51,14 @@
     path="prebuilts/fullsdk-darwin/platforms"
     name="platform/prebuilts/fullsdk/platforms"
     clone-depth="1"
-    revision="master">
+    revision="main">
     <linkfile src="." dest="prebuilts/fullsdk-linux/platforms" />
   </project>
   <project
     path="prebuilts/fullsdk-darwin/sources"
     name="platform/prebuilts/fullsdk/sources"
     clone-depth="1"
-    revision="master">
+    revision="main">
     <linkfile src="." dest="prebuilts/fullsdk-linux/sources" />
   </project>
 
@@ -102,17 +102,17 @@
     clone-depth="1" />
 
   <!-- NDK dependencies -->
-  <!-- Config: shallow + master revision -->
+  <!-- Config: shallow + main revision -->
   <project
     path="prebuilts/fullsdk-darwin/ndk-bundle"
     name="toolchain/prebuilts/ndk-darwin/r23"
-    revision="master"
+    revision="main"
     clone-depth="1"
     groups="notdefault,platform-darwin" />
   <project
     path="prebuilts/fullsdk-darwin/cmake"
     name="platform/prebuilts/cmake/darwin-x86"
-    revision="master"
+    revision="main"
     groups="notdefault,platform-darwin"
     clone-depth="1">
     <linkfile src="bin/cmake" dest="prebuilts/fullsdk-darwin/native-build-tools/bin/cmake" />
@@ -120,7 +120,7 @@
   <project
       path="prebuilts/fullsdk-darwin/ninja"
       name="platform/prebuilts/ninja/darwin-x86"
-      revision="master"
+      revision="main"
       groups="notdefault,platform-darwin"
       clone-depth="1" >
     <linkfile src="ninja" dest="prebuilts/fullsdk-darwin/native-build-tools/bin/ninja" />
@@ -128,13 +128,13 @@
   <project
     path="prebuilts/fullsdk-linux/ndk-bundle"
     name="toolchain/prebuilts/ndk/r23"
-    revision="master"
+    revision="main"
     clone-depth="1"
     groups="notdefault,platform-linux" />
   <project
     path="prebuilts/fullsdk-linux/cmake"
     name="platform/prebuilts/cmake/linux-x86"
-    revision="master"
+    revision="main"
     groups="notdefault,platform-linux"
     clone-depth="1">
     <linkfile src="bin/cmake" dest="prebuilts/fullsdk-linux/native-build-tools/bin/cmake" />
@@ -142,7 +142,7 @@
   <project
     path="prebuilts/fullsdk-linux/ninja"
     name="platform/prebuilts/ninja/linux-x86"
-    revision="master"
+    revision="main"
     groups="notdefault,platform-linux"
     clone-depth="1" >
     <linkfile src="ninja" dest="prebuilts/fullsdk-linux/native-build-tools/bin/ninja" />
@@ -150,16 +150,16 @@
   <project
     path="prebuilts/fullsdk-linux/kernel-build-tools"
     name="kernel/prebuilts/build-tools"
-    revision="master"
+    revision="main"
     groups="notdefault,platform-linux"
     clone-depth="1" />
   
   <!-- JDK dependencies -->
-  <!-- Config: shallow + master revision -->
+  <!-- Config: shallow + main revision -->
   <project
     path="prebuilts/jdk/jdk17"
     name="platform/prebuilts/jdk/jdk17"
-    revision="master"
+    revision="main"
     clone-depth="1" />
   <!-- This branch of JDK 8 contains only the tools JAR required for Compose tests. -->
   <!-- Config: shallow + same revision -->