summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Dan Willemsen <dwillemsen@google.com> 2019-10-07 15:26:26 -0700
committer Dan Willemsen <dwillemsen@google.com> 2019-10-07 15:29:23 -0700
commitb6699a1414d3070fa9cdbc6032536b3aaf6d15c9 (patch)
tree3c2f1604720f8d49976f8a94fba2e7a1d21e8f08
parente8ba308dcf0f04578e2cebb92a8a8347289761d3 (diff)
Restore previous behavior of `get_build_var TMPDIR`
My previous change makes TMPDIR a temporary directory that's removed before we exit. So instead of starting ckati to get this value to a directory that no longer exists, return the semi-stable value that we use during a normal build. Fixes: 142277335 Test: get_build_var TMPDIR Change-Id: I37d1219b1fda09f131dee17ef7b91e475d3e39ad
-rw-r--r--ui/build/dumpvars.go1
1 files changed, 1 insertions, 0 deletions
diff --git a/ui/build/dumpvars.go b/ui/build/dumpvars.go
index 1925e87b9..8581387c3 100644
--- a/ui/build/dumpvars.go
+++ b/ui/build/dumpvars.go
@@ -42,6 +42,7 @@ func DumpMakeVars(ctx Context, config Config, goals, vars []string) (map[string]
soongUiVars := map[string]func() string{
"OUT_DIR": func() string { return config.OutDir() },
"DIST_DIR": func() string { return config.DistDir() },
+ "TMPDIR": func() string { return absPath(ctx, config.TempDir()) },
}
makeVars := make([]string, 0, len(vars))