summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Peter Collingbourne <pcc@google.com> 2021-09-09 18:17:11 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2021-09-09 18:17:11 +0000
commite168f15ab9eff99bb4d444f9f1d79b001cfd8303 (patch)
tree16edc1e9f2f94e3215cbdb32a47b61354adf9675
parent4011ebb12d1e474ef6aa2c1895ea32f72b03200f (diff)
parentcbfbd6482393437ac68f51e59d875572a70629a1 (diff)
Merge "Read LLVM version from $LLVM_PREBUILTS_VERSION if set."
-rwxr-xr-xscripts/get_clang_version.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/scripts/get_clang_version.py b/scripts/get_clang_version.py
index 17bc88bbd..64d922a20 100755
--- a/scripts/get_clang_version.py
+++ b/scripts/get_clang_version.py
@@ -21,8 +21,12 @@ import sys
ANDROID_BUILD_TOP = os.environ.get("ANDROID_BUILD_TOP", ".")
+LLVM_PREBUILTS_VERSION = os.environ.get("LLVM_PREBUILTS_VERSION")
def get_clang_prebuilts_version(global_go):
+ if LLVM_PREBUILTS_VERSION:
+ return LLVM_PREBUILTS_VERSION
+
# TODO(b/187231324): Get clang version from the json file once it is no longer
# hard-coded in global.go
if global_go is None: