Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d3e294d8 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

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

parents 20cf20ba 00a8a3f7

cmd/multiproduct_kati/main.go

+3 −1
Original line number Diff line number Diff line
@@ -412,7 +412,9 @@ func buildProduct(mpctx *mpContext, product string) { 
	ctx.Status.AddOutput(terminal.NewStatusOutput(ctx.Writer, "", false,

		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)

	if !*keepArtifacts {

		config.Environment().Set("EMPTY_NINJA_FILE", "true")

ui/build/config.go

+9 −6
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ type configImpl struct { 
	checkbuild     bool

	dist           bool

	skipMake       bool

	skipSoongTests bool



	// From the product config

	katiArgs        []string
@@ -526,6 +527,8 @@ func (c *configImpl) parseArgs(ctx Context, args []string) { 
			c.verbose = true

		} else if arg == "--skip-make" {

			c.skipMake = true

		} else if arg == "--skip-soong-tests" {

			c.skipSoongTests = true

		} else if len(arg) > 0 && arg[0] == '-' {

			parseArgNum := func(def int) int {

				if len(arg) > 2 {

ui/build/soong.go

+6 −1
Original line number Diff line number Diff line
@@ -38,7 +38,12 @@ func runSoong(ctx Context, config Config) { 
		ctx.BeginTrace(metrics.RunSoong, "blueprint bootstrap")

		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("BOOTSTRAP", "./build/blueprint/bootstrap.bash")

		cmd.Environment.Set("BUILDDIR", config.SoongOutDir())