Merge "Add ABFS (Android Build Filesystem) configuration option to Soong" into main
This commit is contained in:
@@ -211,9 +211,38 @@ func checkRAM(ctx Context, config Config) {
|
||||
}
|
||||
}
|
||||
|
||||
func abfsBuildStarted(ctx Context, config Config) {
|
||||
abfsBox := config.PrebuiltBuildTool("abfsbox")
|
||||
cmdArgs := []string{"build-started", "--"}
|
||||
cmdArgs = append(cmdArgs, config.Arguments()...)
|
||||
cmd := Command(ctx, config, "abfsbox", abfsBox, cmdArgs...)
|
||||
cmd.Sandbox = noSandbox
|
||||
cmd.RunAndPrintOrFatal()
|
||||
}
|
||||
|
||||
func abfsBuildFinished(ctx Context, config Config, finished bool) {
|
||||
var errMsg string
|
||||
if !finished {
|
||||
errMsg = "build was interrupted"
|
||||
}
|
||||
abfsBox := config.PrebuiltBuildTool("abfsbox")
|
||||
cmdArgs := []string{"build-finished", "-e", errMsg, "--"}
|
||||
cmdArgs = append(cmdArgs, config.Arguments()...)
|
||||
cmd := Command(ctx, config, "abfsbox", abfsBox, cmdArgs...)
|
||||
cmd.RunAndPrintOrFatal()
|
||||
}
|
||||
|
||||
// Build the tree. Various flags in `config` govern which components of
|
||||
// the build to run.
|
||||
func Build(ctx Context, config Config) {
|
||||
done := false
|
||||
if config.UseABFS() {
|
||||
abfsBuildStarted(ctx, config)
|
||||
defer func() {
|
||||
abfsBuildFinished(ctx, config, done)
|
||||
}()
|
||||
}
|
||||
|
||||
ctx.Verboseln("Starting build with args:", config.Arguments())
|
||||
ctx.Verboseln("Environment:", config.Environment().Environ())
|
||||
|
||||
@@ -351,6 +380,7 @@ func Build(ctx Context, config Config) {
|
||||
if what&RunDistActions != 0 {
|
||||
runDistActions(ctx, config)
|
||||
}
|
||||
done = true
|
||||
}
|
||||
|
||||
func updateBuildIdDir(ctx Context, config Config) {
|
||||
|
Reference in New Issue
Block a user