StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Ensure we get cross refs for Bazel-built artifacts" am: bf815a135a am: 8e9910fbcc am: b99a3def27

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

Change-Id: I0f69d8bed0b138a217641ad89e43260f8672ab1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-06-30 05:01:26 +00:00
committed by Automerger Merge Worker
parent 2393deb255 b99a3def27
commit 3658def394
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
android/config.go
View File

@@ -701,6 +701,10 @@ func (c *config) IsMixedBuildsEnabled() bool {
if c.productVariables.DeviceArch != nil && *c.productVariables.DeviceArch == "riscv64" { if c.productVariables.DeviceArch != nil && *c.productVariables.DeviceArch == "riscv64" {
return false return false
} }
// Disable Bazel when Kythe is running
if c.EmitXrefRules() {
return false
}
if c.IsEnvTrue("GLOBAL_THINLTO") { if c.IsEnvTrue("GLOBAL_THINLTO") {
return false return false
} }