StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Make null builds always be null builds."

Browse Source
This commit is contained in:
Lukács T. Berki
2021-03-24 15:48:02 +00:00
committed by Gerrit Code Review
parent a1063c09f6 c99c947c88
commit f2926e751c
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
cmd/soong_build/main.go
View File

@@ -21,6 +21,7 @@ import (
"os"
"path/filepath"
"strings"
"time"
"android/soong/shared"
"github.com/google/blueprint/bootstrap"
@@ -191,13 +192,24 @@ func main() {
func writeUsedVariablesFile(path string, configuration android.Config) {
data, err := shared.EnvFileContents(configuration.EnvDeps())
if err != nil {
fmt.Fprintf(os.Stderr, "error writing used variables file %s: %s", path, err)
fmt.Fprintf(os.Stderr, "error writing used variables file %s: %s\n", path, err)
os.Exit(1)
}
err = ioutil.WriteFile(path, data, 0666)
if err != nil {
fmt.Fprintf(os.Stderr, "error writing used variables file %s: %s", path, err)
fmt.Fprintf(os.Stderr, "error writing used variables file %s: %s\n", path, err)
os.Exit(1)
}
// Touch the output Ninja file so that it's not older than the file we just
// wrote. We can't write the environment file earlier because one an access
// new environment variables while writing it.
outputNinjaFile := shared.JoinPath(topDir, bootstrap.CmdlineOutFile())
currentTime := time.Now().Local()
err = os.Chtimes(outputNinjaFile, currentTime, currentTime)
if err != nil {
fmt.Fprintf(os.Stderr, "error touching output file %s: %s\n", outputNinjaFile, err)
os.Exit(1)
}
}