summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2023-07-06 11:19:52 -0700
committerXin Li <delphij@google.com>2023-07-06 11:19:52 -0700
commiteb598fe7c7fc847ac6a51a4db3f4dcf87f49a60e (patch)
tree47911bde34b0d7c31fce078cfd2195166c83e1c8
parent0d4cb84969a46e45d824ca3dc38bfd45b29bfdb5 (diff)
downloadmanifest-eb598fe7c7fc847ac6a51a4db3f4dcf87f49a60e.tar.gz
DO NOT MERGE ANYWHERE - Update android14-gs-pixel-6.1 to use main branch.
Bug: b/289400079 Change-Id: Idb97f64b0c4684b3c969871cb5f579963dfa6daa
-rw-r--r--default.xml30
1 files changed, 15 insertions, 15 deletions
diff --git a/default.xml b/default.xml
index 3189828..454e2da 100644
--- a/default.xml
+++ b/default.xml
@@ -7,7 +7,7 @@
<superproject name="kernel/superproject" remote="aosp" revision="android-gs-raviole-6.1" />
- <project path="build/kernel" name="kernel/build" revision="master" >
+ <project path="build/kernel" name="kernel/build" revision="main" >
<linkfile src="kleaf/bazel.sh" dest="tools/bazel" />
<linkfile src="kleaf/bazel.WORKSPACE" dest="WORKSPACE" />
<linkfile src="build.sh" dest="build/build.sh" />
@@ -45,20 +45,20 @@
<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/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" />
+ <project path="kernel/configs" name="kernel/configs" revision="main" />
+ <project path="prebuilts/clang/host/linux-x86" name="platform/prebuilts/clang/host/linux-x86" revision="main" 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="main" clone-depth="1" />
+ <project path="prebuilts/build-tools" name="platform/prebuilts/build-tools" revision="main" clone-depth="1" />
+ <project path="prebuilts/clang-tools" name="platform/prebuilts/clang-tools" revision="main" clone-depth="1" />
+ <project path="prebuilts/kernel-build-tools" name="kernel/prebuilts/build-tools" revision="main" clone-depth="1" />
+ <project path="tools/mkbootimg" name="platform/system/tools/mkbootimg" revision="main" />
- <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="prebuilts/bazel/linux-x86_64" name="platform/prebuilts/bazel/linux-x86_64" revision="main" clone-depth="1" />
+ <project path="prebuilts/jdk/jdk11" name="platform/prebuilts/jdk/jdk11" revision="main" clone-depth="1" />
+ <project path="prebuilts/ndk-r23" name="toolchain/prebuilts/ndk/r23" revision="main" 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/stardoc" name="platform/external/stardoc" revision="master" />
- <project path="external/python/absl-py" name="platform/external/python/absl-py" revision="master" />
+ <project path="external/bazel-skylib" name="platform/external/bazel-skylib" revision="main" />
+ <project path="build/bazel_common_rules" name="platform/build/bazel_common_rules" revision="main" />
+ <project path="external/stardoc" name="platform/external/stardoc" revision="main" />
+ <project path="external/python/absl-py" name="platform/external/python/absl-py" revision="main" />
</manifest>