Merge "Read LLVM version from $LLVM_PREBUILTS_VERSION if set." am: e168f15ab9

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1822335

Change-Id: I4e9049d5717b1a9ed87f9232ced1e4e7f995ba55
This commit is contained in:
Peter Collingbourne 2021-09-09 18:36:07 +00:00 committed by Automerger Merge Worker
commit 4ceae5b280

View file

@ -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: