Define command line args in soong_build .

They used to be defined in Blueprint but since it doesn't have a
separate existence anymore, we can consolidate all command line
arguments here.

Note that Blueprint is called directly from soong_ui, but that happens
by a simple Go function call and not by invoking a separate binary, so
command line arguments are not needed there.

Test: Presubmits.
Change-Id: Ifa2c101ddbe424b76fc5a508d3d41c329e7353ca
This commit is contained in:
Lukacs T. Berki
2021-08-16 15:24:48 +02:00
parent 9d7cf6a336
commit f9008075d9
2 changed files with 31 additions and 16 deletions

View File

@@ -28,8 +28,6 @@ import (
"android/soong/bazel/cquery"
"github.com/google/blueprint/bootstrap"
"android/soong/bazel"
"android/soong/shared"
)
@@ -760,7 +758,7 @@ func (c *bazelSingleton) GenerateBuildActions(ctx SingletonContext) {
// Add ninja file dependencies for files which all bazel invocations require.
bazelBuildList := absolutePath(filepath.Join(
filepath.Dir(bootstrap.CmdlineArgs.ModuleListFile), "bazel.list"))
filepath.Dir(ctx.Config().moduleListFile), "bazel.list"))
ctx.AddNinjaFileDeps(bazelBuildList)
data, err := ioutil.ReadFile(bazelBuildList)