Merge "Don't run SoongBuildInvocation for bp2build + dist" am: cf7961200b am: baa916152c am: 74ff2363e2

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

Change-Id: I11ac52885c5984b187b75d0f58408226804e8cc0

ui/build/config.go

@@ -721,10 +721,6 @@ func (c *configImpl) Arguments() []string {
 }
 
 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 @@ func (c *configImpl) SoongBuildInvocationNeeded() bool {
 		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
 }