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

Add a denylist for specifically mixed builds am: bab4d7e3bc am: 2678212a0f am: cd40ec4e44

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

Change-Id: Ie9b5de425df4cc868fb851b49fefa0039900f50c
This commit is contained in:
Chris Parsons
2021-04-19 20:12:36 +00:00
committed by Automerger Merge Worker
parent 82da9e5887 cd40ec4e44
commit 5db4828abb
3 changed files with 27 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cc/cc.go
View File

@@ -1641,7 +1641,7 @@ func (c *Module) setSubnameProperty(actx android.ModuleContext) {
func (c *Module) maybeGenerateBazelActions(actx android.ModuleContext) bool {
bazelModuleLabel := c.GetBazelLabel(actx, c)
bazelActionsUsed := false
if c.bazelHandler != nil && actx.Config().BazelContext.BazelEnabled() && len(bazelModuleLabel) > 0 {
if c.MixedBuildsEnabled(actx) && c.bazelHandler != nil {
bazelActionsUsed = c.bazelHandler.generateBazelBuildActions(actx, bazelModuleLabel)
}
return bazelActionsUsed