Merge "Ensure we get cross refs for Bazel-built artifacts" am: bf815a135a
am: 8e9910fbcc
am: b99a3def27
am: 3658def394
am: e795ed3ffa
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2643055 Change-Id: I21792476fcf99449eb088cd52414a5311c3bfa9e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -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
|
||||
}
|
||||
|
Reference in New Issue
Block a user