tequilaOS/platform_build_blueprint
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

cleanup: remove deprecated module ioutil am: 83ede83a31 am: b519ebb0b8 am: e08fe2741c am: 8f192e1ca3

Browse source 
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2219404

Change-Id: Iede5690968eba382a28eefa8d6ce2ce81e843399
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
usta 2022-09-20 07:12:34 +00:00 committed by Automerger Merge Worker
commit f0c8db82b6
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
bootstrap/command.go
View file

@ -18,7 +18,6 @@ import (
"bufio" "bufio"
"fmt" "fmt"
"io" "io"
"io/ioutil"
"os" "os"
"path/filepath" "path/filepath"
"runtime" "runtime"
@ -44,9 +43,10 @@ type Args struct {
BazelModeDev bool BazelModeDev bool
} }
// Returns the list of dependencies the emitted Ninja files has. These can be // RunBlueprint emits `args.OutFile` (a Ninja file) and returns the list of
// written to the .d file for the output so that it is correctly rebuilt when // its dependencies. These can be written to a `${args.OutFile}.d` file
// needed in case Blueprint is itself invoked from Ninja // so that it is correctly rebuilt when needed in case Blueprint is itself
// invoked from Ninja
func RunBlueprint(args Args, stopBefore StopBefore, ctx *blueprint.Context, config interface{}) []string { func RunBlueprint(args Args, stopBefore StopBefore, ctx *blueprint.Context, config interface{}) []string {
runtime.GOMAXPROCS(runtime.NumCPU()) runtime.GOMAXPROCS(runtime.NumCPU())
@ -141,7 +141,7 @@ func RunBlueprint(args Args, stopBefore StopBefore, ctx *blueprint.Context, conf
ctx.BeginEvent("write_files") ctx.BeginEvent("write_files")
defer ctx.EndEvent("write_files") defer ctx.EndEvent("write_files")
if args.EmptyNinjaFile { if args.EmptyNinjaFile {
if err := ioutil.WriteFile(joinPath(ctx.SrcDir(), args.OutFile), []byte(nil), outFilePermissions); err != nil { if err := os.WriteFile(joinPath(ctx.SrcDir(), args.OutFile), []byte(nil), outFilePermissions); err != nil {
fatalf("error writing empty Ninja file: %s", err) fatalf("error writing empty Ninja file: %s", err)
} }
} }
@ -154,7 +154,7 @@ func RunBlueprint(args Args, stopBefore StopBefore, ctx *blueprint.Context, conf
buf = bufio.NewWriterSize(f, 16*1024*1024) buf = bufio.NewWriterSize(f, 16*1024*1024)
out = buf out = buf
} else { } else {
out = ioutil.Discard.(io.StringWriter) out = io.Discard.(io.StringWriter)
} }
err = ctx.WriteBuildFile(out) err = ctx.WriteBuildFile(out)