summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Patrice Arruda <patricearruda@google.com> 2019-07-08 17:26:47 -0700
committer Patrice Arruda <patricearruda@google.com> 2019-07-16 11:22:22 -0700
commit19bd53e39c63100138f2db807cc3b626501cbc45 (patch)
treef8711f5189a829c42b491d631bd729eda5e68510
parent0dcf27f6396f0b06dade38f9417c55cb4f9c268e (diff)
soong_ui: Do not clean the OutDir path multiple times.
If OUT_DIR has been specified through the command line arguments, it is sanitized first and NewConfig sets the OUT_DIR in the build environment. When calling OutDir from Config instance, the out was being sanitized again which is unnecessary. Bug: b/118730755 Test: Ran unit test cases, "lunch" followed by "m" command. Change-Id: Ieb4ffa1026c802c76c7369e8cdb3923a4c70f4b3
-rw-r--r--ui/build/config.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/ui/build/config.go b/ui/build/config.go
index 7238c3245..20bb3d1f7 100644
--- a/ui/build/config.go
+++ b/ui/build/config.go
@@ -638,7 +638,7 @@ func (c *configImpl) Arguments() []string {
func (c *configImpl) OutDir() string {
if outDir, ok := c.environ.Get("OUT_DIR"); ok {
- return filepath.Clean(outDir)
+ return outDir
}
return "out"
}