diff options
| author | Pirama Arumuga Nainar <pirama@google.com> | 2024-02-23 08:01:55 +0000 |
|---|---|---|
| committer | Pirama Arumuga Nainar <pirama@google.com> | 2024-02-23 08:07:03 +0000 |
| commit | 34c7569f3067daf1ca7dcd7e1e50e06d7f747a33 (patch) | |
| tree | 4729fec2bc8b3e896c101352e7628565512e369e | |
| parent | 66ae104046d1ac374e3976761d3a2c299ce069c9 (diff) | |
| parent | 44617cd06c9535477e3e33e24e42a2f8661c8538 (diff) | |
| download | manifest-llvm-toolchain-testing.tar.gz | |
[conflict] Switch llvm-project to the main branch am: 44617cd06cllvm-toolchain-testing
Original change: https://android-review.googlesource.com/c/platform/manifest/+/2974225
Change-Id: I9a310617f6a48b316d331f8f0d1dbd6ca7a8fed3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | default.xml | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/default.xml b/default.xml index 2c27faf20..4ef7663cd 100644 --- a/default.xml +++ b/default.xml @@ -20,8 +20,7 @@ <!-- Core LLVM toolchain components --> <project path="bionic" name="platform/bionic" /> <project path="toolchain/binutils" name="toolchain/binutils" /> - <project path="toolchain/llvm-project" name="toolchain/llvm-project" - revision="master-legacy" /> + <project path="toolchain/llvm-project" name="toolchain/llvm-project" /> <project path="toolchain/llvm_android" name="toolchain/llvm_android" revision="llvm-toolchain-testing" /> <project path="toolchain/common" name="toolchain/common" /> |