Embed minibp into soong_ui.
This requires linking Blueprint into soong_ui. It lets us avoid the complicated dance of Ninja files and shell scripts: now the information as to how soong_build is built is passed directly to Blueprint using a struct that contains all the information the command line arguments used to contain. The ability to run Blueprint from the command line is kept (for now). Some variables in bootstrap/command.go needed public accessor functions because soong_build reads them. This will be disentangled by moving the flag parsing to soong_build. The presence of the flag definitions in Blueprint means that soong_ui now also accepts them. This is not a problem in practice because they are ignored and because soong_ui itself is hidden behind a few layers of shell scripts. Test: Presubmits + the new bootstrap_test.sh . Change-Id: I6dca478f356f56a8aee1e457d71439272351390b
This commit is contained in:
@@ -70,7 +70,7 @@ var commands []command = []command{
|
||||
return build.NewConfig(ctx, args...)
|
||||
},
|
||||
stdio: stdio,
|
||||
run: make,
|
||||
run: runMake,
|
||||
}, {
|
||||
flag: "--dumpvar-mode",
|
||||
description: "print the value of the legacy make variable VAR to stdout",
|
||||
@@ -92,7 +92,7 @@ var commands []command = []command{
|
||||
description: "build modules based on the specified build action",
|
||||
config: buildActionConfig,
|
||||
stdio: stdio,
|
||||
run: make,
|
||||
run: runMake,
|
||||
},
|
||||
}
|
||||
|
||||
@@ -478,7 +478,7 @@ func buildActionConfig(ctx build.Context, args ...string) build.Config {
|
||||
return build.NewBuildActionConfig(buildAction, *dir, ctx, args...)
|
||||
}
|
||||
|
||||
func make(ctx build.Context, config build.Config, _ []string, logsDir string) {
|
||||
func runMake(ctx build.Context, config build.Config, _ []string, logsDir string) {
|
||||
if config.IsVerbose() {
|
||||
writer := ctx.Writer
|
||||
fmt.Fprintln(writer, "! The argument `showcommands` is no longer supported.")
|
||||
|
Reference in New Issue
Block a user