Update the manifest for android14-gs-pixel-6.1

Bug: 278583483
Change-Id: I512182fb73ce519775a1b5e4a37610ae8020d991
Signed-off-by: Will McVicker <willmcvicker@google.com>

1 files changed, 41 insertions, 37 deletions

diff --git a/default.xml b/default.xml
index 267119f..0a95ee8 100644
--- a/default.xml
+++ b/default.xml
@@ -1,34 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <manifest>
-  <remote  name="aosp" fetch=".." review="https://android-review.googlesource.com/" />
-  <default revision="android-gs-raviole-mainline" remote="aosp" sync-j="4" />
+  <remote  name="aosp"
+           fetch="https://android.googlesource.com/"
+           review="https://android-review.googlesource.com/" />
+  <default revision="android14-gs-pixel-6.1" remote="aosp" sync-j="4" />
 
-  <superproject name="kernel/superproject" remote="aosp" revision="gs-android-gs-raviole-mainline" />
-
-  <project path="common" name="kernel/common" revision="android-mainline" >
-    <linkfile dest=".source_date_epoch_dir" src="." />
-  </project>
-  <project path="gs/google-modules/soc-modules" name="kernel/google-modules/raviole-device" >
-    <linkfile src="build.config.slider" dest="build.config" />
-    <linkfile src="build_slider.sh" dest="build_slider.sh" />
-  </project>
-
-  <project path="gs/google-modules/amplifiers" name="kernel/google-modules/amplifiers" />
-  <project path="gs/google-modules/aoc" name="kernel/google-modules/aoc" />
-  <project path="gs/google-modules/aoc_ipc" name="kernel/google-modules/aoc-ipc" />
-  <project path="gs/google-modules/bluetooth/broadcom" name="kernel/google-modules/bluetooth/broadcom" />
-  <project path="gs/google-modules/bms" name="kernel/google-modules/bms" />
-  <project path="gs/google-modules/display" name="kernel/google-modules/display" />
-  <project path="gs/google-modules/edgetpu" name="kernel/google-modules/edgetpu" />
-  <project path="gs/google-modules/gpu" name="kernel/google-modules/gpu" />
-  <project path="gs/google-modules/lwis" name="kernel/google-modules/lwis" />
-  <project path="gs/google-modules/power/reset" name="kernel/google-modules/power/reset" />
-  <project path="gs/google-modules/touch/common" name="kernel/google-modules/touch/common" />
-  <project path="gs/google-modules/touch/fts" name="kernel/google-modules/touch/fts_touch" />
-  <project path="gs/google-modules/touch/sec" name="kernel/google-modules/touch/sec_touch" />
-  <project path="gs/google-modules/uwb" name="kernel/google-modules/uwb" />
-  <project path="gs/google-modules/nfc" name="kernel/google-modules/nfc" />
-  <project path="gs/google-modules/wlan/bcmdhd4389" name="kernel/google-modules/wlan/bcmdhd/bcm4389" />
+  <superproject name="kernel/superproject" remote="aosp" revision="android-gs-raviole-6.1" />
 
   <project path="build/kernel" name="kernel/build" revision="master" >
     <linkfile src="kleaf/bazel.sh" dest="tools/bazel" />
@@ -44,20 +21,47 @@
     <linkfile src="abi" dest="build/abi" />
     <linkfile src="static_analysis" dest="build/static_analysis" />
   </project>
+  <project path="common" name="kernel/common" revision="android14-6.1" >
+    <linkfile src="." dest=".source_date_epoch_dir" />
+  </project>
+
+  <project path="private/google-modules/soc/gs" name="kernel/google-modules/raviole-device" >
+    <linkfile src="build.config.slider" dest="build.config" />
+    <linkfile src="device.bazelrc" dest="device.bazelrc" />
+  </project>
+
+  <project path="private/google-modules/amplifiers" name="kernel/google-modules/amplifiers" />
+  <project path="private/google-modules/aoc" name="kernel/google-modules/aoc" />
+  <project path="private/google-modules/aoc_ipc" name="kernel/google-modules/aoc-ipc" />
+  <project path="private/google-modules/bluetooth/broadcom" name="kernel/google-modules/bluetooth/broadcom" />
+  <project path="private/google-modules/bms" name="kernel/google-modules/bms" />
+  <project path="private/google-modules/display" name="kernel/google-modules/display" />
+  <project path="private/google-modules/edgetpu/abrolhos" name="kernel/google-modules/edgetpu/abrolhos" />
+  <project path="private/google-modules/gpu" name="kernel/google-modules/gpu" />
+  <project path="private/google-modules/lwis" name="kernel/google-modules/lwis" />
+  <project path="private/google-modules/power/reset" name="kernel/google-modules/power/reset" />
+  <project path="private/google-modules/touch/common" name="kernel/google-modules/touch/common" />
+  <project path="private/google-modules/touch/fts" name="kernel/google-modules/touch/fts_touch" />
+  <project path="private/google-modules/touch/sec" name="kernel/google-modules/touch/sec_touch" />
+  <project path="private/google-modules/uwb" name="kernel/google-modules/uwb" />
+  <project path="private/google-modules/nfc" name="kernel/google-modules/nfc" />
+  <project path="private/google-modules/wlan/bcmdhd4389" name="kernel/google-modules/wlan/bcmdhd/bcm4389" />
+
+  <project path="prebuilts/boot-artifacts" name="platform/prebuilts/boot-artifacts" clone-depth="1" revision="android13-gs-raviole-5.15" />
   <project path="kernel/configs" name="kernel/configs" revision="master" />
   <project path="prebuilts/clang/host/linux-x86" name="platform/prebuilts/clang/host/linux-x86" revision="master" 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" revision="master" clone-depth="1" />
-  <project path="prebuilts/misc" name="platform/prebuilts/misc" revision="master" clone-depth="1" />
-  <project path="prebuilts/boot-artifacts" name="platform/prebuilts/boot-artifacts" clone-depth="1" />
   <project path="prebuilts/build-tools" name="platform/prebuilts/build-tools" revision="master" clone-depth="1" />
+  <project path="prebuilts/clang-tools" name="platform/prebuilts/clang-tools" revision="master" clone-depth="1" />
   <project path="prebuilts/kernel-build-tools" name="kernel/prebuilts/build-tools" revision="master" clone-depth="1" />
-  <project path="tools/mkbootimg" name="platform/system/tools/mkbootimg" revision="master" clone-depth="1" />
+  <project path="tools/mkbootimg" name="platform/system/tools/mkbootimg" revision="master" />
+
+  <project path="prebuilts/bazel/linux-x86_64" name="platform/prebuilts/bazel/linux-x86_64" revision="master" clone-depth="1" />
+  <project path="prebuilts/jdk/jdk11" name="platform/prebuilts/jdk/jdk11" revision="master" clone-depth="1" />
+  <project path="prebuilts/ndk-r23" name="toolchain/prebuilts/ndk/r23" revision="master" clone-depth="1" />
 
+  <project path="external/bazel-skylib" name="platform/external/bazel-skylib" revision="master" />
   <project path="build/bazel_common_rules" name="platform/build/bazel_common_rules" revision="master" />
-  <project path="external/bazel-skylib" name="platform/external/bazel-skylib" revision="master" clone-depth="1" />
-  <project path="external/stardoc" name="platform/external/stardoc" revision="master" clone-depth="1" />
-  <project path="external/python/absl-py" name="platform/external/python/absl-py" revision="master" clone-depth="1" />
-  <project path="prebuilts/bazel/linux-x86_64" name="platform/prebuilts/bazel/linux-x86_64" clone-depth="1" revision="master" />
-  <project path="prebuilts/jdk/jdk11" name="platform/prebuilts/jdk/jdk11" clone-depth="1" revision="master" />
-  <project path="prebuilts/ndk-r23" name="toolchain/prebuilts/ndk/r23" clone-depth="1" revision="master" />
+  <project path="external/stardoc" name="platform/external/stardoc" revision="master" />
+  <project path="external/python/absl-py" name="platform/external/python/absl-py" revision="master" />
 </manifest>