Refactor androidx-main manifest

Cleans up organization and removes unnecessary properties.

Bug: 1798709
Test: Tested locally
Change-Id: I5a85dc20dbb35dec83d3a5494fdc36e35249787e

1 files changed, 55 insertions, 47 deletions

diff --git a/default.xml b/default.xml
index 3da5576d2..7b1eec5c7 100644
--- a/default.xml
+++ b/default.xml
@@ -4,39 +4,42 @@
            fetch=".."
            review="https://android-review.googlesource.com/" />
   <default revision="androidx-main"
-           remote="aosp"
-           sync-j="8" />
-
+           remote="aosp" />
   <superproject name="platform/superproject" remote="aosp"/>
 
   <!-- BEGIN dependencies -->
   <project path="build/make" name="platform/build" />
-  <project path="manifest" name="platform/manifest" />
+
   <!-- External dependencies -->
   <!-- Config: shallow + same revision -->
-  <project path="external/noto-fonts" name="platform/external/noto-fonts" groups="pdk" clone-depth="1" />
-  <project path="external/webview_support_interfaces" name="platform/external/webview_support_interfaces" groups="pdk" clone-depth="1" />
-  <project path="external/doclava" name="platform/external/doclava" groups="pdk" clone-depth="1" revision="master" />
-  <project path="external/dokka" name="platform/external/dokka" groups="pdk" clone-depth="1" revision="master" />
-  <project path="external/icing" name="platform/external/icing" groups="pdk" clone-depth="1" />
-  <project path="external/icu" name="platform/external/icu" groups="pdk" clone-depth="1" />
-  <project path="external/libyuv" name="platform/external/libyuv" groups="pdk" clone-depth="1" revision="master" />
-  <project path="external/google-benchmark" name="platform/external/google-benchmark" groups="pdk" clone-depth="1" revision="androidx-main" />
+  <project path="external/noto-fonts" name="platform/external/noto-fonts" clone-depth="1" />
+  <project path="external/webview_support_interfaces" name="platform/external/webview_support_interfaces" clone-depth="1" />
+  <project path="external/icing" name="platform/external/icing" clone-depth="1" />
+  <project path="external/icu" name="platform/external/icu" clone-depth="1" />
+  <project path="external/google-benchmark" name="platform/external/google-benchmark" clone-depth="1" />
   <!-- The contents of external/protobuf must be kept in sync with the contents of prebuilts/protobuf -->
-  <project path="external/protobuf" name="platform/external/protobuf" groups="pdk" clone-depth="1" />
-  <project path="prebuilts/androidx/external" name="platform/prebuilts/androidx/external" groups="pdk" clone-depth="1" />
-  <project path="prebuilts/androidx/internal" name="platform/prebuilts/androidx/internal" groups="pdk" clone-depth="1" />
-  <project path="prebuilts/androidx/exoplayer" name="platform/prebuilts/androidx/exoplayer" groups="pdk" clone-depth="1" />
-  <project path="prebuilts/androidx/traceprocessor" name="platform/prebuilts/androidx/traceprocessor" groups="pdk" clone-depth="1" />
+  <project path="external/protobuf" name="platform/external/protobuf" clone-depth="1" />
+  <project path="prebuilts/androidx/external" name="platform/prebuilts/androidx/external" clone-depth="1" />
+  <project path="prebuilts/androidx/internal" name="platform/prebuilts/androidx/internal" clone-depth="1" />
+  <project path="prebuilts/androidx/exoplayer" name="platform/prebuilts/androidx/exoplayer" clone-depth="1" />
+  <project path="prebuilts/androidx/traceprocessor" name="platform/prebuilts/androidx/traceprocessor" clone-depth="1" />
+  <!-- Config: shallow + master revision -->
+  <project path="external/doclava" name="platform/external/doclava" clone-depth="1" revision="master" />
+  <project path="external/dokka" name="platform/external/dokka" clone-depth="1" revision="master" />
+  <project path="external/libyuv" name="platform/external/libyuv" clone-depth="1" revision="master" />
+
   <!-- Tools dependencies -->
   <!-- Config: shallow + master revision -->
-  <project path="prebuilts/checkstyle" name="platform/prebuilts/checkstyle" groups="pdk-fs" clone-depth="1" revision="master" />
+  <project path="prebuilts/checkstyle" name="platform/prebuilts/checkstyle" clone-depth="1" revision="master" />
+  <project path="tools/repohooks" name="platform/tools/repohooks" revision="master" />
+  <!-- Config: shallow + same revision -->
   <!-- The contents of external/protobuf must be kept in sync with the contents of prebuilts/protobuf -->
-  <project path="prebuilts/protobuf" name="platform/prebuilts/protobuf" groups="pdk-fs" clone-depth="1" />
-  <project path="tools/repohooks" name="platform/tools/repohooks" groups="adt-infra,cts,eclipse,motodev,pdk,tools,tradefed" revision="master" />
+  <project path="prebuilts/protobuf" name="platform/prebuilts/protobuf" clone-depth="1" />
+
   <!-- Gradle dependencies -->
-  <!-- Config: shallow -->
-  <project path="tools/external/gradle" name="platform/tools/external/gradle" groups="tools" clone-depth="1" />
+  <!-- Config: shallow + same revision -->
+  <project path="tools/external/gradle" name="platform/tools/external/gradle" clone-depth="1" />
+
   <!-- SDK dependencies (shared) -->
   <!-- Config: shallow + master revision -->
   <project
@@ -68,19 +71,17 @@
     <linkfile src="." dest="prebuilts/fullsdk-linux/sources/android-31" />
   </project>
   <project
-    path="prebuilts/fullsdk-darwin/ndk"
-    name="toolchain/prebuilts/ndk-darwin/r21"
+    path="prebuilts/jdk/jdk11"
+    name="platform/prebuilts/jdk/jdk11"
     revision="master"
-    clone-depth="1"
-    groups="notdefault,platform-darwin">
-  </project>
+    clone-depth="1" />
+  <!-- Config: shallow + same revision -->
+  <!-- This branch of JDK 8 contains only the tools JAR required for Compose tests and Doclava. -->
   <project
-    path="prebuilts/fullsdk-linux/ndk"
-    name="toolchain/prebuilts/ndk/r21"
-    revision="master"
-    clone-depth="1"
-    groups="notdefault,platform-linux">
-  </project>
+    path="prebuilts/jdk/jdk8"
+    name="platform/prebuilts/jdk/jdk8"
+    clone-depth="1" />
+
   <!-- SDK dependencies (darwin) -->
   <!-- Config: shallow + master revision -->
   <project
@@ -96,6 +97,12 @@
     clone-depth="1"
     groups="notdefault,platform-darwin" />
   <project
+    path="prebuilts/fullsdk-darwin/ndk"
+    name="toolchain/prebuilts/ndk-darwin/r21"
+    revision="master"
+    clone-depth="1"
+    groups="notdefault,platform-darwin" />
+  <project
     path="prebuilts/fullsdk-darwin/platform-tools"
     name="platform/prebuilts/fullsdk-darwin/platform-tools"
     revision="master"
@@ -107,12 +114,14 @@
     revision="master"
     clone-depth="1"
     groups="notdefault,platform-darwin" />
+  <!-- Config: shallow + explicit revision -->
   <project
     path="prebuilts/fullsdk-darwin/cmake"
     name="platform/prebuilts/cmake/darwin-x86"
     revision="fc59035d8c856055f2a263dc8a2f9de96c959cc2"
     groups="notdefault,platform-darwin"
     clone-depth="1" />
+
   <!-- SDK dependencies (linux) -->
   <!-- Config: shallow + master revision -->
   <project
@@ -128,6 +137,12 @@
     clone-depth="1"
     groups="notdefault,platform-linux" />
   <project
+    path="prebuilts/fullsdk-linux/ndk"
+    name="toolchain/prebuilts/ndk/r21"
+    revision="master"
+    clone-depth="1"
+    groups="notdefault,platform-linux" />
+  <project
     path="prebuilts/fullsdk-linux/platform-tools"
     name="platform/prebuilts/fullsdk-linux/platform-tools"
     revision="master"
@@ -139,29 +154,22 @@
     revision="master"
     clone-depth="1"
     groups="notdefault,platform-linux" />
-  <project
-    path="prebuilts/jdk/jdk8"
-    name="platform/prebuilts/jdk/jdk8"
-    revision="androidx-main"
-    groups="pdk"
-    clone-depth="1" />
-  <project
-    path="prebuilts/jdk/jdk11"
-    name="platform/prebuilts/jdk/jdk11"
-    revision="master"
-    groups="pdk"
-    clone-depth="1" />
+  <!-- Config: shallow + explicit revision -->
   <project
     path="prebuilts/fullsdk-linux/cmake"
     name="platform/prebuilts/cmake/linux-x86"
     revision="de5fa1c66d3bdcbf2bbc62d2504ec6b0b0fb74e1"
     groups="notdefault,platform-linux"
     clone-depth="1" />
+
   <!-- Golden images -->
-  <project path="golden" name="platform/frameworks/support-golden" groups="pdk" clone-depth="1" />
+  <project path="golden" name="platform/frameworks/support-golden" clone-depth="1" />
+
   <!-- END dependencies -->
+
   <!-- BEGIN target project -->
-  <project path="frameworks/support" name="platform/frameworks/support" groups="pdk-cw-fs,pdk-fs" />
+  <project path="frameworks/support" name="platform/frameworks/support" />
   <!-- END target project -->
+
   <repo-hooks in-project="platform/tools/repohooks" enabled-list="pre-upload" />
 </manifest>