summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2023-07-06 11:19:54 -0700
committerXin Li <delphij@google.com>2023-07-06 11:19:54 -0700
commit616e0b2d22869893f08067313d9e2b9323a2043d (patch)
treeea057e79bd23d5e24ee18d89d219eb2dcf73adf5
parent3d2639ac0da3b1542c6f485810498de6cdb7e1a4 (diff)
downloadmanifest-616e0b2d22869893f08067313d9e2b9323a2043d.tar.gz
DO NOT MERGE ANYWHERE - Update common-android-mainline to use main branch.
Bug: b/289400079 Change-Id: Iba7eaa81385d97c4d3c536f46f42aee0f72024d9
-rw-r--r--default.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/default.xml b/default.xml
index a6f19e2..4db40b6 100644
--- a/default.xml
+++ b/default.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<manifest>
<remote name="aosp" fetch=".." review="https://android-review.googlesource.com/" />
- <default revision="master" remote="aosp" sync-j="4" />
+ <default revision="main" remote="aosp" sync-j="4" />
<superproject name="kernel/superproject" remote="aosp" revision="common-android-mainline" />
@@ -16,7 +16,7 @@
<linkfile src="android-mainline" dest="common/patches" />
</project>
<project path="kernel/tests" name="kernel/tests" />
- <project path="kernel/configs" name="kernel/configs" revision="master" />
+ <project path="kernel/configs" name="kernel/configs" revision="main" />
<project path="common-modules/virtual-device" name="kernel/common-modules/virtual-device" revision="android-mainline" />
<project path="prebuilts/clang/host/linux-x86" name="platform/prebuilts/clang/host/linux-x86" 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" clone-depth="1" />