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

Merge "Stop changes to BAZEL_METRICS_DIR regenerating ninja file"

Browse source
This commit is contained in:
Paul Duffin 2023-01-05 18:02:10 +00:00 committed by Gerrit Code Review
commit 58f7784e95
1 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
android/bazel_handler.go
View file

@ -432,16 +432,26 @@ func NewBazelContext(c *config) (BazelContext, error) {
vars := []struct { vars := []struct {
name string name string
ptr *string ptr *string
// True if the environment variable needs to be tracked so that changes to the variable
// cause the ninja file to be regenerated, false otherwise. False should only be set for
// environment variables that have no effect on the generated ninja file.
track bool
}{ }{
{"BAZEL_HOME", &paths.homeDir}, {"BAZEL_HOME", &paths.homeDir, true},
{"BAZEL_PATH", &paths.bazelPath}, {"BAZEL_PATH", &paths.bazelPath, true},
{"BAZEL_OUTPUT_BASE", &paths.outputBase}, {"BAZEL_OUTPUT_BASE", &paths.outputBase, true},
{"BAZEL_WORKSPACE", &paths.workspaceDir}, {"BAZEL_WORKSPACE", &paths.workspaceDir, true},
{"BAZEL_METRICS_DIR", &paths.metricsDir}, {"BAZEL_METRICS_DIR", &paths.metricsDir, false},
{"BAZEL_DEPS_FILE", &paths.bazelDepsFile}, {"BAZEL_DEPS_FILE", &paths.bazelDepsFile, true},
} }
for _, v := range vars { for _, v := range vars {
if s := c.Getenv(v.name); len(s) > 1 { if v.track {
if s := c.Getenv(v.name); len(s) > 1 {
*v.ptr = s
continue
}
} else if s, ok := c.env[v.name]; ok {
*v.ptr = s *v.ptr = s
} else { } else {
missing = append(missing, v.name) missing = append(missing, v.name)