aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrice Arruda <patricearruda@google.com>2019-07-08 17:26:47 -0700
committerMichael Bestas <mkbestas@lineageos.org>2019-12-11 19:03:32 +0200
commit138dd2ad0fbd3ec86b634ee387d64ffb82732701 (patch)
treef0c8881fe18e530de3d9c18b3b74c9552abc80ca
parent63c2e705e53caa6b299a14e4d7282af7ff53109f (diff)
downloadbuild_soong-138dd2ad0fbd3ec86b634ee387d64ffb82732701.tar.gz
build_soong-138dd2ad0fbd3ec86b634ee387d64ffb82732701.tar.bz2
build_soong-138dd2ad0fbd3ec86b634ee387d64ffb82732701.zip
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 116101ed..5440f7e8 100644
--- a/ui/build/config.go
+++ b/ui/build/config.go
@@ -639,7 +639,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"
}