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

Commit e1df43fa authored by Lukacs T. Berki's avatar Lukacs T. Berki
Browse files

Implement cleanups requested in aosp/1818245: 

- Remove useValidations: whenever it was used, it was turned on, so
there was no point in keeping that knob
- Use the new soong_build invocation name constants

Test: Presubmits.
Change-Id: Ia3e8928d30d3de1e0adaa741111771304e56b139
parent 89fcdcb7

android/config.go

+5 −11
Original line number Diff line number Diff line
@@ -79,10 +79,6 @@ func (c Config) RunGoTests() bool { 
	return c.runGoTests

}



func (c Config) UseValidationsForGoTests() bool {

	return c.useValidationsForGoTests

}



func (c Config) DebugCompilation() bool {

	return false // Never compile Go code in the main build for debugging

}
@@ -143,7 +139,6 @@ type config struct { 
	moduleListFile string // the path to the file which lists blueprint files to parse.



	runGoTests bool

	useValidationsForGoTests bool



	env       map[string]string

	envLock   sync.Mutex
@@ -440,7 +435,6 @@ func NewConfig(moduleListFile string, runGoTests bool, outDir, soongOutDir strin 
		outDir:            outDir,

		soongOutDir:       soongOutDir,

		runGoTests:        runGoTests,

		useValidationsForGoTests: runGoTests,

		multilibConflicts: make(map[ArchType]bool),



		moduleListFile: moduleListFile,

ui/build/config.go

+4 −0
Original line number Diff line number Diff line
@@ -784,6 +784,10 @@ func (c *configImpl) NamedGlobFile(name string) string { 
	return shared.JoinPath(c.SoongOutDir(), ".bootstrap/build-globs."+name+".ninja")

}



func (c *configImpl) UsedEnvFile(tag string) string {

	return shared.JoinPath(c.SoongOutDir(), usedEnvFile+"."+tag)

}



func (c *configImpl) MainNinjaFile() string {

	return shared.JoinPath(c.SoongOutDir(), "build.ninja")

}

ui/build/soong.go

+12 −17
Original line number Diff line number Diff line
@@ -81,7 +81,6 @@ type BlueprintConfig struct { 
	soongOutDir               string

	outDir                    string

	runGoTests                bool

	useValidations            bool

	debugCompilation          bool

	subninjas                 []string

	primaryBuilderInvocations []bootstrap.PrimaryBuilderInvocation
@@ -103,10 +102,6 @@ func (c BlueprintConfig) RunGoTests() bool { 
	return c.runGoTests

}



func (c BlueprintConfig) UseValidationsForGoTests() bool {

	return c.useValidations

}



func (c BlueprintConfig) DebugCompilation() bool {

	return c.debugCompilation

}
@@ -119,10 +114,10 @@ func (c BlueprintConfig) PrimaryBuilderInvocations() []bootstrap.PrimaryBuilderI 
	return c.primaryBuilderInvocations

}



func environmentArgs(config Config, suffix string) []string {

func environmentArgs(config Config, tag string) []string {

	return []string{

		"--available_env", shared.JoinPath(config.SoongOutDir(), availableEnvFile),

		"--used_env", shared.JoinPath(config.SoongOutDir(), usedEnvFile+"."+suffix),

		"--used_env", config.UsedEnvFile(tag),

	}

}
@@ -254,7 +249,6 @@ func bootstrapBlueprint(ctx Context, config Config) { 
		toolDir:     config.HostToolDir(),

		outDir:      config.OutDir(),

		runGoTests:  !config.skipSoongTests,

		useValidations: !config.skipSoongTests,

		// If we want to debug soong_build, we need to compile it for debugging

		debugCompilation: os.Getenv("SOONG_DELVE") != "",

		subninjas:        globFiles,
@@ -279,6 +273,7 @@ func checkEnvironmentFile(currentEnv *Environment, envFile string) { 
		v, _ := currentEnv.Get(k)

		return v

	}



	if stale, _ := shared.StaleEnvFile(envFile, getenv); stale {

		os.Remove(envFile)

	}
@@ -328,22 +323,22 @@ func runSoong(ctx Context, config Config) { 
		ctx.BeginTrace(metrics.RunSoong, "environment check")

		defer ctx.EndTrace()



		checkEnvironmentFile(soongBuildEnv, filepath.Join(config.SoongOutDir(), usedEnvFile+".build"))

		checkEnvironmentFile(soongBuildEnv, config.UsedEnvFile(soongBuildTag))



		if integratedBp2Build || config.Bp2Build() {

			checkEnvironmentFile(soongBuildEnv, filepath.Join(config.SoongOutDir(), usedEnvFile+".bp2build"))

			checkEnvironmentFile(soongBuildEnv, config.UsedEnvFile(bp2buildTag))

		}



		if config.JsonModuleGraph() {

			checkEnvironmentFile(soongBuildEnv, filepath.Join(config.SoongOutDir(), usedEnvFile+".modulegraph"))

			checkEnvironmentFile(soongBuildEnv, config.UsedEnvFile(jsonModuleGraphTag))

		}



		if config.Queryview() {

			checkEnvironmentFile(soongBuildEnv, filepath.Join(config.SoongOutDir(), usedEnvFile+".queryview"))

			checkEnvironmentFile(soongBuildEnv, config.UsedEnvFile(queryviewTag))

		}



		if config.SoongDocs() {

			checkEnvironmentFile(soongBuildEnv, filepath.Join(config.SoongOutDir(), usedEnvFile+".soong_docs"))

			checkEnvironmentFile(soongBuildEnv, config.UsedEnvFile(soongDocsTag))

		}

	}()