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

Merge "Stop changes to BAZEL_METRICS_DIR regenerating ninja file" am: 58f7784e95

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2366149

Change-Id: I1c2b7503fbf4193ddadfa264973f68d75636d15b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Paul Duffin
2023-01-05 18:57:02 +00:00
committed by Automerger Merge Worker
parent 7a065260c1 58f7784e95
commit 27139a1412
1 changed files with 17 additions and 7 deletions
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 {
name 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_PATH", &paths.bazelPath},
{"BAZEL_OUTPUT_BASE", &paths.outputBase},
{"BAZEL_WORKSPACE", &paths.workspaceDir},
{"BAZEL_METRICS_DIR", &paths.metricsDir},
{"BAZEL_DEPS_FILE", &paths.bazelDepsFile},
{"BAZEL_HOME", &paths.homeDir, true},
{"BAZEL_PATH", &paths.bazelPath, true},
{"BAZEL_OUTPUT_BASE", &paths.outputBase, true},
{"BAZEL_WORKSPACE", &paths.workspaceDir, true},
{"BAZEL_METRICS_DIR", &paths.metricsDir, false},
{"BAZEL_DEPS_FILE", &paths.bazelDepsFile, true},
}
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
} else {
missing = append(missing, v.name)