From 5e960d7e58317dfd32605bb13356cfa280c2928d Mon Sep 17 00:00:00 2001
From: Matthias Maennich <maennich@google.com>
Date: Sun, 12 Dec 2021 15:25:41 +0000
Subject: [PATCH] ANDROID: Kleaf: Fix branch-specific toolchain_version

In order to update the Clang version per branch, use the branch specific
value defined in build.config.constants instead of falling back to the
default toolchain defined in the Kleaf implementation.

Bug: 210296725
Signed-off-by: Matthias Maennich <maennich@google.com>
Change-Id: I8929ec4b4174fc286710a5c66741b140656bb455
---
 BUILD.bazel | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/BUILD.bazel b/BUILD.bazel
index 463a49d36579..67e5228d7732 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -18,5 +18,6 @@ package(
 )
 
 load("//build/kleaf:common_kernels.bzl", "define_common_kernels")
+load("@kernel_toolchain_info//:dict.bzl", "CLANG_VERSION")
 
-define_common_kernels()
+define_common_kernels(toolchain_version = CLANG_VERSION)