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

Add --skip-soong-tests argument to soong_ui and use it in multiproduct_kati

Browse Source 
There is no need for multiproduct_kati to run the tests for
every product, they don't vary by product config. --skip-soong-tests
can also be used for local development to run soong_build even if
the tests don't pass.

Bug: 156428456
Test: m --skip-soong-tests nothing
Change-Id: I9c00e3d1b6e51d17bb290339c3f124d4d1c9e69f
This commit is contained in:
Colin Cross
2020-10-29 14:08:31 -07:00
parent 31076b3185
commit 00a8a3f746
3 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/multiproduct_kati/main.go
View File

@@ -412,7 +412,9 @@ func buildProduct(mpctx *mpContext, product string) {
ctx.Status.AddOutput(terminal.NewStatusOutput(ctx.Writer, "", false, ctx.Status.AddOutput(terminal.NewStatusOutput(ctx.Writer, "", false,
build.OsEnvironment().IsEnvTrue("ANDROID_QUIET_BUILD"))) build.OsEnvironment().IsEnvTrue("ANDROID_QUIET_BUILD")))
config := build.NewConfig(ctx, flag.Args()...) args := append([]string(nil), flag.Args()...)
args = append(args, "--skip-soong-tests")
config := build.NewConfig(ctx, args...)
config.Environment().Set("OUT_DIR", outDir) config.Environment().Set("OUT_DIR", outDir)
if !*keepArtifacts { if !*keepArtifacts {
config.Environment().Set("EMPTY_NINJA_FILE", "true") config.Environment().Set("EMPTY_NINJA_FILE", "true")

15
ui/build/config.go
View File

@@ -41,12 +41,13 @@ type configImpl struct {
buildDateTime string buildDateTime string
// From the arguments // From the arguments
parallel int parallel int
keepGoing int keepGoing int
verbose bool verbose bool
checkbuild bool checkbuild bool
dist bool dist bool
skipMake bool skipMake bool
skipSoongTests bool
// From the product config // From the product config
katiArgs []string katiArgs []string
@@ -526,6 +527,8 @@ func (c *configImpl) parseArgs(ctx Context, args []string) {
c.verbose = true c.verbose = true
} else if arg == "--skip-make" { } else if arg == "--skip-make" {
c.skipMake = true c.skipMake = true
} else if arg == "--skip-soong-tests" {
c.skipSoongTests = true
} else if len(arg) > 0 && arg[0] == '-' { } else if len(arg) > 0 && arg[0] == '-' {
parseArgNum := func(def int) int { parseArgNum := func(def int) int {
if len(arg) > 2 { if len(arg) > 2 {

7
ui/build/soong.go
View File

@@ -38,7 +38,12 @@ func runSoong(ctx Context, config Config) {
ctx.BeginTrace(metrics.RunSoong, "blueprint bootstrap") ctx.BeginTrace(metrics.RunSoong, "blueprint bootstrap")
defer ctx.EndTrace() defer ctx.EndTrace()
cmd := Command(ctx, config, "blueprint bootstrap", "build/blueprint/bootstrap.bash", "-t", "-n") args := []string{"-n"}
if !config.skipSoongTests {
args = append(args, "-t")
}
cmd := Command(ctx, config, "blueprint bootstrap", "build/blueprint/bootstrap.bash", args...)
cmd.Environment.Set("BLUEPRINTDIR", "./build/blueprint") cmd.Environment.Set("BLUEPRINTDIR", "./build/blueprint")
cmd.Environment.Set("BOOTSTRAP", "./build/blueprint/bootstrap.bash") cmd.Environment.Set("BOOTSTRAP", "./build/blueprint/bootstrap.bash")
cmd.Environment.Set("BUILDDIR", config.SoongOutDir()) cmd.Environment.Set("BUILDDIR", config.SoongOutDir())