Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1db55e4c authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix a bug in the log directory cleanup logic." into main am: c5d2456d 

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



Change-Id: I008c62706c5a1d428023aa6318e316e79c09fdd2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d6663871 c5d2456d

ui/build/config.go

+4 −2
Original line number Diff line number Diff line
@@ -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

}