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

Merge "Don't run SoongBuildInvocation for bp2build + dist"

Browse Source
This commit is contained in:
Liz Kammer
2021-12-16 14:04:53 +00:00
committed by Gerrit Code Review
parent 911e9f8654 886774204b
commit cf7961200b
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ui/build/config.go
View File

@@ -721,10 +721,6 @@ func (c *configImpl) Arguments() []string {
} }
func (c *configImpl) SoongBuildInvocationNeeded() bool { func (c *configImpl) SoongBuildInvocationNeeded() bool {
if c.Dist() {
return true
}
if len(c.Arguments()) > 0 { if len(c.Arguments()) > 0 {
// Explicit targets requested that are not special targets like b2pbuild // Explicit targets requested that are not special targets like b2pbuild
// or the JSON module graph // or the JSON module graph
@@ -736,6 +732,11 @@ func (c *configImpl) SoongBuildInvocationNeeded() bool {
return true return true
} }
// bp2build + dist may be used to dist bp2build logs but does not require SoongBuildInvocation
if c.Dist() && !c.Bp2Build() {
return true
}
// build.ninja doesn't need to be generated // build.ninja doesn't need to be generated
return false return false
} }