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

Merge "Support host platform cc builds" am: 4f5b548e74 am: 063cd58d11 am: 79f7491e78 am: d1da8a1fb1 am: 039183d116

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

Change-Id: I1d876756a323f788cd56816713d8022594f61835
This commit is contained in:
Christopher Parsons
2021-11-11 18:29:09 +00:00
committed by Automerger Merge Worker
parent e558319465 039183d116
commit f13f05e439
3 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cc/cc.go
View File

@@ -1717,7 +1717,7 @@ func (c *Module) maybeGenerateBazelActions(actx android.ModuleContext) bool {
bazelActionsUsed := false
// Mixed builds mode is disabled for modules outside of device OS.
// TODO(b/200841190): Support non-device OS in mixed builds.
if c.MixedBuildsEnabled(actx) && c.bazelHandler != nil && actx.Os().Class == android.Device {
if c.MixedBuildsEnabled(actx) && c.bazelHandler != nil {
bazelActionsUsed = c.bazelHandler.GenerateBazelBuildActions(actx, bazelModuleLabel)
}
return bazelActionsUsed