diff options
author | Pirama Arumuga Nainar <pirama@google.com> | 2021-03-10 05:57:21 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-10 05:57:21 +0000 |
commit | 898f8d62d1305674635d1e341b5839154d4e6acd (patch) | |
tree | 73936aba47fe1dc71e9cc05af9747036e935608c /llvm_tools/git_llvm_rev.py | |
parent | 5948a3ee3be44c312f11fb2acc617cce94e95582 (diff) | |
parent | 6e9f5ed75e19d8fc561fda91f5d133ef1ceacd03 (diff) | |
download | toolchain-utils-898f8d62d1305674635d1e341b5839154d4e6acd.tar.gz |
Merging 15 commit(s) from Chromium's toolchain-utils am: f5cc9231be am: 1b67a6a703 am: 6e9f5ed75eandroid-mainline-12.0.0_r4android-mainline-12.0.0_r36android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r26android-12.1.0_r25android-12.1.0_r24android-12.1.0_r23android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r18android-12.1.0_r17android-12.1.0_r16android-12.1.0_r15android-12.1.0_r14android-12.1.0_r13android-12.1.0_r12android-12.1.0_r11android-12.1.0_r10android-12.0.0_r32android-12.0.0_r29android-12.0.0_r28android-12.0.0_r27android-12.0.0_r26android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android-12.0.0_r16android12L-devandroid12L-d2-s8-releaseandroid12L-d2-s7-releaseandroid12L-d2-s6-releaseandroid12L-d2-s5-releaseandroid12L-d2-s4-releaseandroid12L-d2-s3-releaseandroid12L-d2-s2-releaseandroid12L-d2-s1-releaseandroid12L-d2-releaseandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseandroid12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-devandroid12--mainline-release
Original change: https://android-review.googlesource.com/c/platform/external/toolchain-utils/+/1624621
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I3e09c0f25dea2ce281aa3edc999669d4d383510b
Diffstat (limited to 'llvm_tools/git_llvm_rev.py')
-rwxr-xr-x | llvm_tools/git_llvm_rev.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/llvm_tools/git_llvm_rev.py b/llvm_tools/git_llvm_rev.py index 07209f1e..c8c1505c 100755 --- a/llvm_tools/git_llvm_rev.py +++ b/llvm_tools/git_llvm_rev.py @@ -7,7 +7,7 @@ """Maps LLVM git SHAs to synthetic revision numbers and back. Revision numbers are all of the form '(branch_name, r1234)'. As a shorthand, -r1234 is parsed as '(master, 1234)'. +r1234 is parsed as '(main, 1234)'. """ from __future__ import print_function @@ -18,7 +18,7 @@ import subprocess import sys import typing as t -MAIN_BRANCH = 'master' +MAIN_BRANCH = 'main' # Note that after base_llvm_sha, we reach The Wild West(TM) of commits. # So reasonable input that could break us includes: |