Refactor the creation of soong_build calls.
They were a bit repetitive.
In addition, make the environment checks more correct; they could
probably use an integration test or two to make sure that when the
environment changes, exactly those outputs are rebuilt that need to be,
but for now, this is an improvement already.
Test: Presubmits.
Change-Id: Idd79b81ca6975d57d00e5bf4699d266152505ff8
diff --git a/android/config.go b/android/config.go
index 1587f10..af1e6c8 100644
--- a/android/config.go
+++ b/android/config.go
@@ -418,8 +418,8 @@
// bootstrap run. Only per-run data is reset. Data which needs to persist across
// multiple runs in the same program execution is carried over (such as Bazel
// context or environment deps).
-func ConfigForAdditionalRun(cmdlineArgs bootstrap.Args, c Config) (Config, error) {
- newConfig, err := NewConfig(cmdlineArgs, c.soongOutDir, c.env)
+func ConfigForAdditionalRun(c Config) (Config, error) {
+ newConfig, err := NewConfig(c.moduleListFile, c.runGoTests, c.outDir, c.soongOutDir, c.env)
if err != nil {
return Config{}, err
}
@@ -430,20 +430,20 @@
// NewConfig creates a new Config object. The srcDir argument specifies the path
// to the root source directory. It also loads the config file, if found.
-func NewConfig(cmdlineArgs bootstrap.Args, soongOutDir string, availableEnv map[string]string) (Config, error) {
+func NewConfig(moduleListFile string, runGoTests bool, outDir, soongOutDir string, availableEnv map[string]string) (Config, error) {
// Make a config with default options.
config := &config{
ProductVariablesFileName: filepath.Join(soongOutDir, productVariablesFileName),
env: availableEnv,
- outDir: cmdlineArgs.OutDir,
+ outDir: outDir,
soongOutDir: soongOutDir,
- runGoTests: cmdlineArgs.RunGoTests,
- useValidationsForGoTests: cmdlineArgs.UseValidations,
+ runGoTests: runGoTests,
+ useValidationsForGoTests: runGoTests,
multilibConflicts: make(map[ArchType]bool),
- moduleListFile: cmdlineArgs.ModuleListFile,
+ moduleListFile: moduleListFile,
fs: pathtools.NewOsFs(absSrcDir),
}