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

Commit c0aa94c1 authored by Ramy Medhat's avatar Ramy Medhat Committed by Automerger Merge Worker
Browse files

Merge "Set download_tmp_dir explicitly to be a directory under the output... 

Merge "Set download_tmp_dir explicitly to be a directory under the output directory." into main am: 67b49731

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



Change-Id: Ib7c036acd04cbef3684818ae2b00b1af0a17e861
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 029d1673 67b49731

ui/build/config.go

+13 −0
Original line number Diff line number Diff line
@@ -1349,6 +1349,19 @@ func (c *configImpl) rbeProxyLogsDir() string { 
			return v

		}

	}

	return c.rbeTmpDir()

}



func (c *configImpl) rbeDownloadTmpDir() string {

    for _, f := range []string{"RBE_download_tmp_dir", "FLAG_download_tmp_dir"} {

		if v, ok := c.environ.Get(f); ok {

			return v

		}

	}

	return c.rbeTmpDir()

}



func (c *configImpl) rbeTmpDir() string {

	buildTmpDir := shared.TempDirForOutDir(c.SoongOutDir())

	return filepath.Join(buildTmpDir, "rbe")

}

ui/build/rbe.go

+8 −7
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ func getRBEVars(ctx Context, config Config) map[string]string { 
		"RBE_output_dir":       config.rbeProxyLogsDir(),

		"RBE_proxy_log_dir":    config.rbeProxyLogsDir(),

		"RBE_cache_dir":        config.rbeCacheDir(),

		"RBE_download_tmp_dir": config.rbeDownloadTmpDir(),

		"RBE_platform":         "container-image=" + remoteexec.DefaultImage,

	}

	if config.StartRBE() {