Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4ceae5b2 authored by Peter Collingbourne's avatar Peter Collingbourne Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: I4e9049d5717b1a9ed87f9232ced1e4e7f995ba55
parents 16010fe5 e168f15a
Loading
Loading
Loading
Loading
+4 −0
Original line number Diff line number Diff line
@@ -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: