openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge changes Id261b5a3,Ice6f34d0 

* changes:
  Fix errorProtoLog error messages
  Write BUILD_DATETIME_FILE after SetupOutDir
This commit is contained in:
Treehugger Robot 2019-12-05 09:10:13 +00:00 committed by Gerrit Code Review
parent 5f9e5244c5 ff27ce4cc0
commit dc0e8fd131
3 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ui/build/build.go
View File

@ -33,6 +33,15 @@ func SetupOutDir(ctx Context, config Config) {
// can be parsed as ninja output.
ensureEmptyFileExists(ctx, filepath.Join(config.OutDir(), "ninja_build"))
ensureEmptyFileExists(ctx, filepath.Join(config.OutDir(), ".out-dir"))
if buildDateTimeFile, ok := config.environ.Get("BUILD_DATETIME_FILE"); ok {
err := ioutil.WriteFile(buildDateTimeFile, []byte(config.buildDateTime), 0777)
if err != nil {
ctx.Fatalln("Failed to write BUILD_DATETIME to file:", err)
}
} else {
ctx.Fatalln("Missing BUILD_DATETIME_FILE")
}
}
var combinedBuildNinjaTemplate = template.Must(template.New("combined").Parse(`

14
ui/build/config.go
View File

@ -15,7 +15,6 @@
package build
import (
"io/ioutil"
"os"
"path/filepath"
"runtime"
@ -34,6 +33,7 @@ type configImpl struct {
goma bool
environ *Environment
distDir string
buildDateTime string
// From the arguments
parallel int
@ -244,18 +244,14 @@ func NewConfig(ctx Context, args ...string) Config {
outDir := ret.OutDir()
buildDateTimeFile := filepath.Join(outDir, "build_date.txt")
var content string
if buildDateTime, ok := ret.environ.Get("BUILD_DATETIME"); ok && buildDateTime != "" {
content = buildDateTime
ret.buildDateTime = buildDateTime
} else {
content = strconv.FormatInt(time.Now().Unix(), 10)
ret.buildDateTime = strconv.FormatInt(time.Now().Unix(), 10)
}
if ctx.Metrics != nil {
ctx.Metrics.SetBuildDateTime(content)
}
err := ioutil.WriteFile(buildDateTimeFile, []byte(content), 0777)
if err != nil {
ctx.Fatalln("Failed to write BUILD_DATETIME to file:", err)
ctx.Metrics.SetBuildDateTime(ret.buildDateTime)
}
ret.environ.Set("BUILD_DATETIME_FILE", buildDateTimeFile)

4
ui/status/log.go
View File

@ -180,12 +180,12 @@ func (e *errorProtoLog) FinishAction(result ActionResult, counts Counts) {
func (e *errorProtoLog) Flush() {
data, err := proto.Marshal(&e.errorProto)
if err != nil {
e.log.Println("Failed to marshal build status proto: %v", err)
e.log.Printf("Failed to marshal build status proto: %v\n", err)
return
}
err = ioutil.WriteFile(e.filename, []byte(data), 0644)
if err != nil {
e.log.Println("Failed to write file %s: %v", e.errorProto, err)
e.log.Printf("Failed to write file %s: %v\n", e.filename, err)
}
}