diff options
| author | 2021-01-19 13:10:28 +0000 | |
|---|---|---|
| committer | 2021-01-19 13:10:28 +0000 | |
| commit | 0e3aaa47aa950a7ace18cde1c8b9bae3d9959752 (patch) | |
| tree | 43906c6da9a453cd911c5d737c83a152d39162d3 | |
| parent | f61dfa5a02c22c4ba85b20f7c4724efe000c0c7f (diff) | |
| parent | 09b609d476cd90aaaead968288aa86d3e0efd2f6 (diff) | |
Merge "Remove unused parameter to newContext."
| -rw-r--r-- | cmd/soong_build/main.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cmd/soong_build/main.go b/cmd/soong_build/main.go index 907bed3c7..1b7ac553b 100644 --- a/cmd/soong_build/main.go +++ b/cmd/soong_build/main.go @@ -57,7 +57,7 @@ func bazelConversionRequested(configuration android.Config) bool { return configuration.IsEnvTrue("CONVERT_TO_BAZEL") } -func newContext(srcDir string, configuration android.Config) *android.Context { +func newContext(configuration android.Config) *android.Context { ctx := android.NewContext(configuration) if bazelConversionRequested(configuration) { // Register an alternate set of singletons and mutators for bazel @@ -106,7 +106,7 @@ func main() { // needed to correctly evaluate the tree in the second pass. // TODO(cparsons): Don't output any ninja file, as the second pass will overwrite // the incorrect results from the first pass, and file I/O is expensive. - firstCtx := newContext(srcDir, configuration) + firstCtx := newContext(configuration) configuration.SetStopBefore(bootstrap.StopBeforeWriteNinja) bootstrap.Main(firstCtx.Context, configuration, extraNinjaDeps...) // Invoke bazel commands and save results for second pass. @@ -120,10 +120,10 @@ func main() { fmt.Fprintf(os.Stderr, "%s", err) os.Exit(1) } - ctx = newContext(srcDir, secondPassConfig) + ctx = newContext(secondPassConfig) bootstrap.Main(ctx.Context, secondPassConfig, extraNinjaDeps...) } else { - ctx = newContext(srcDir, configuration) + ctx = newContext(configuration) bootstrap.Main(ctx.Context, configuration, extraNinjaDeps...) } |