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
diff --git a/android/config.go b/android/config.go
index af1e6c8..0767e7b 100644
--- a/android/config.go
+++ b/android/config.go
@@ -79,10 +79,6 @@
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
}
@@ -142,8 +138,7 @@
soongOutDir string
moduleListFile string // the path to the file which lists blueprint files to parse.
- runGoTests bool
- useValidationsForGoTests bool
+ runGoTests bool
env map[string]string
envLock sync.Mutex
@@ -437,11 +432,10 @@
env: availableEnv,
- outDir: outDir,
- soongOutDir: soongOutDir,
- runGoTests: runGoTests,
- useValidationsForGoTests: runGoTests,
- multilibConflicts: make(map[ArchType]bool),
+ outDir: outDir,
+ soongOutDir: soongOutDir,
+ runGoTests: runGoTests,
+ multilibConflicts: make(map[ArchType]bool),
moduleListFile: moduleListFile,
fs: pathtools.NewOsFs(absSrcDir),
diff --git a/ui/build/config.go b/ui/build/config.go
index 126a8d4..35dacf2 100644
--- a/ui/build/config.go
+++ b/ui/build/config.go
@@ -784,6 +784,10 @@
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")
}
diff --git a/ui/build/soong.go b/ui/build/soong.go
index 9aa4810..617d293 100644
--- a/ui/build/soong.go
+++ b/ui/build/soong.go
@@ -81,7 +81,6 @@
soongOutDir string
outDir string
runGoTests bool
- useValidations bool
debugCompilation bool
subninjas []string
primaryBuilderInvocations []bootstrap.PrimaryBuilderInvocation
@@ -103,10 +102,6 @@
return c.runGoTests
}
-func (c BlueprintConfig) UseValidationsForGoTests() bool {
- return c.useValidations
-}
-
func (c BlueprintConfig) DebugCompilation() bool {
return c.debugCompilation
}
@@ -119,10 +114,10 @@
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),
}
}
@@ -250,11 +245,10 @@
blueprintCtx := blueprint.NewContext()
blueprintCtx.SetIgnoreUnknownModuleTypes(true)
blueprintConfig := BlueprintConfig{
- soongOutDir: config.SoongOutDir(),
- toolDir: config.HostToolDir(),
- outDir: config.OutDir(),
- runGoTests: !config.skipSoongTests,
- useValidations: !config.skipSoongTests,
+ soongOutDir: config.SoongOutDir(),
+ toolDir: config.HostToolDir(),
+ outDir: config.OutDir(),
+ runGoTests: !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 @@
v, _ := currentEnv.Get(k)
return v
}
+
if stale, _ := shared.StaleEnvFile(envFile, getenv); stale {
os.Remove(envFile)
}
@@ -328,22 +323,22 @@
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))
}
}()