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>
This commit is contained in:
@@ -1375,10 +1375,12 @@ 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 {
|
||||
if v, ok := c.environ.Get(f); ok {
|
||||
if v != c.rbeTmpDir() {
|
||||
return false
|
||||
}
|
||||
}
|
||||
}
|
||||
return true
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user