Merge "Speed up build_test" (a758cda4) · Commits · e / os / android_build_soong

cmd/multiproduct_kati/main.go

+4 −6

Original line number	Diff line number	Diff line
		@@ -393,6 +393,9 @@ func buildProduct(mpctx *mpContext, product string) {

		config := build.NewConfig(ctx, flag.Args()...)
		config.Environment().Set("OUT_DIR", outDir)
		if !*keepArtifacts {
		config.Environment().Set("EMPTY_NINJA_FILE", "true")
		}
		build.FindSources(ctx, config, mpctx.Finder)
		config.Lunch(ctx, product, *buildVariant)

		@@ -413,12 +416,7 @@ func buildProduct(mpctx *mpContext, product string) {
		log.Fatalf("Error zipping artifacts: %v", err)
		}
		}
		if *incremental {
		// Save space, Kati doesn't notice
		if f := config.KatiBuildNinjaFile(); f != "" {
		os.Truncate(f, 0)
		}
		} else {
		if !*incremental {
		os.RemoveAll(outDir)
		}
		}()

+3 −0

Original line number	Diff line number	Diff line
		@@ -143,6 +143,9 @@ func NewConfig(ctx Context, args ...string) Config {
		"ANDROID_DEV_SCRIPTS",
		"ANDROID_EMULATOR_PREBUILTS",
		"ANDROID_PRE_BUILD_PATHS",

		// Only set in multiproduct_kati after config generation
		"EMPTY_NINJA_FILE",
		)

		// Tell python not to spam the source tree with .pyc files.

+4 −0

Original line number	Diff line number	Diff line
		@@ -81,6 +81,10 @@ func runKati(ctx Context, config Config, extraSuffix string, args []string, envF
		"--kati_stats",
		}, args...)

		if config.Environment().IsEnvTrue("EMPTY_NINJA_FILE") {
		args = append(args, "--empty_ninja_file")
		}

		cmd := Command(ctx, config, "ckati", executable, args...)
		cmd.Sandbox = katiSandbox
		pipe, err := cmd.StdoutPipe()