Use NINJA_GOALS as the default in non kati builds
Generated ninja in `m` and `m --soong-only` create two default ninja
targets
- droid
- blueprint_tests
However, `m` only builds droid by virtue of adding `droid` (NINJA_GOALS
from build/make/core/ninja_config.mk) to the ninja execution.
This CL adds `NINJA_GOALS` to Soong_ui's NinjaArgs even in skipKati
mode.
Test: Looked at out/soong.log to verify that `droid` is passed to the
ninja execution in m --soong-only
Bug: 393393003
Test: m --no-skip-soong-tests # runs all tests
Test: m --no-skip-soong-tests --no-soong-only # runs all tests
Change-Id: I9fe4a52ce08ad9e257ad7e57db8637668d611948
diff --git a/ui/build/config.go b/ui/build/config.go
index fdd15ff..2a00c41 100644
--- a/ui/build/config.go
+++ b/ui/build/config.go
@@ -1101,7 +1101,7 @@
func (c *configImpl) NinjaArgs() []string {
if c.skipKati {
- return c.arguments
+ return append(c.arguments, c.ninjaArgs...)
}
return c.ninjaArgs
}