Don't run SoongBuildInvocation for bp2build + dist
Test: build/bazel/ci/bp2build.sh
Change-Id: I8d24ba437f8af4528ca739feace84e8cfccc5e0b
diff --git a/ui/build/config.go b/ui/build/config.go
index 4c26d3e..b6d0d27 100644
--- a/ui/build/config.go
+++ b/ui/build/config.go
@@ -721,10 +721,6 @@
}
func (c *configImpl) SoongBuildInvocationNeeded() bool {
- if c.Dist() {
- return true
- }
-
if len(c.Arguments()) > 0 {
// Explicit targets requested that are not special targets like b2pbuild
// or the JSON module graph
@@ -736,6 +732,11 @@
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
return false
}
