diff options
author | Xin Li <delphij@google.com> | 2023-07-06 11:20:00 -0700 |
---|---|---|
committer | Xin Li <delphij@google.com> | 2023-07-06 11:20:00 -0700 |
commit | bd1dc76a3027d86c6e1bcac9376f325420a8c13d (patch) | |
tree | ce117058a2a2e9382e0bf234026bc7354cb0a257 | |
parent | 4673b393102663df053925942049daa44c55636e (diff) | |
download | manifest-bd1dc76a3027d86c6e1bcac9376f325420a8c13d.tar.gz |
DO NOT MERGE ANYWHERE - Update u-boot-mainline to use main branch.
Bug: b/289400079
Change-Id: I9d5b2830c2041da67352e4f4a8cd06e7a610caca
-rw-r--r-- | default.xml | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/default.xml b/default.xml index 7f3252e..b217457 100644 --- a/default.xml +++ b/default.xml @@ -1,14 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> <manifest> <!-- - This branch is a master side branch and is configured to have all project + This branch is a main side branch and is configured to have all project specific rules. When updating this manifest file, please also update the project rule in google3 to ensure new projects get testing. See go/side-branch-testing for details. --> <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="u-boot-mainline"/> <contactinfo bugurl="go/repo-bug" /> @@ -18,16 +18,16 @@ <project path="build/kernel" name="kernel/build" > <linkfile src="kleaf/bazel.sh" dest="tools/bazel" /> </project> - <project path="external/arm-trusted-firmware" name="platform/external/arm-trusted-firmware" revision="master" /> + <project path="external/arm-trusted-firmware" name="platform/external/arm-trusted-firmware" revision="main" /> <project path="external/boringssl" name="platform/external/boringssl" /> - <project path="external/compiler-rt" name="platform/external/compiler-rt" revision="master" /> - <project path="external/dtc" name="platform/external/dtc" revision="master" /> + <project path="external/compiler-rt" name="platform/external/compiler-rt" revision="main" /> + <project path="external/dtc" name="platform/external/dtc" revision="main" /> <project path="external/open-dice" name="platform/external/open-dice" /> <project path="external/bazel-skylib" name="platform/external/bazel-skylib" /> <project path="external/stardoc" name="platform/external/stardoc" /> - <project path="external/swig" name="platform/external/swig" revision="master" /> - <project path="external/zlib" name="platform/external/zlib" revision="master" /> - <project path="u-boot" name="platform/external/u-boot" revision="master"> + <project path="external/swig" name="platform/external/swig" revision="main" /> + <project path="external/zlib" name="platform/external/zlib" revision="main" /> + <project path="u-boot" name="platform/external/u-boot" revision="main"> <linkfile src="." dest=".source_date_epoch_dir" /> <linkfile src="bazel.WORKSPACE" dest="WORKSPACE" /> </project> |