diff options
| author | 2024-09-12 19:47:12 +0000 | |
|---|---|---|
| committer | 2024-09-12 19:47:12 +0000 | |
| commit | e021e615fa23e2e2f391727c49dbb57b32e5ed1d (patch) | |
| tree | edb26907e70ce94ffcf160a623713d92e958ed7e | |
| parent | c911462cbfaa6cd8b9775ba064656578fe14bd1b (diff) | |
| parent | 1db55e4c54230592b93fa903ed69e391dfb7ab90 (diff) | |
Merge "Fix a bug in the log directory cleanup logic." into main am: c5d2456d8b am: 1db55e4c54
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3248133
Change-Id: I07f18df21c4daa44804008e49df9ad36f2023722
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | ui/build/config.go | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ui/build/config.go b/ui/build/config.go index f02222e1a..d72c8fa01 100644 --- a/ui/build/config.go +++ b/ui/build/config.go @@ -1375,8 +1375,10 @@ func (c *configImpl) shouldCleanupRBELogsDir() bool { // Perform a log directory cleanup only when the log directory // is auto created by the build rather than user-specified. for _, f := range []string{"RBE_proxy_log_dir", "FLAG_output_dir"} { - if _, ok := c.environ.Get(f); ok { - return false + if v, ok := c.environ.Get(f); ok { + if v != c.rbeTmpDir() { + return false + } } } return true |