From 36ba6b2347e9036fb17b3d3f58c1c26840d26f02 Mon Sep 17 00:00:00 2001 From: Liz Kammer Date: Thu, 29 Jun 2023 10:18:39 -0400 Subject: [PATCH] Ensure we get cross refs for Bazel-built artifacts Test: CI Change-Id: I377dde648e023d1ac8e44b6e814475f7410cd2eb --- android/config.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/android/config.go b/android/config.go index 60c3e9b02..b0eaea6ac 100644 --- a/android/config.go +++ b/android/config.go @@ -701,6 +701,10 @@ func (c *config) IsMixedBuildsEnabled() bool { if c.productVariables.DeviceArch != nil && *c.productVariables.DeviceArch == "riscv64" { return false } + // Disable Bazel when Kythe is running + if c.EmitXrefRules() { + return false + } if c.IsEnvTrue("GLOBAL_THINLTO") { return false }