diff options
| author | Patrice Arruda <patricearruda@google.com> | 2019-07-08 17:26:47 -0700 |
|---|---|---|
| committer | Luca Stefani <luca.stefani.ge1@gmail.com> | 2019-09-04 15:35:19 +0200 |
| commit | 5165ee989afa9752510e5d1eb8af4e9a44032827 (patch) | |
| tree | d77294a7d7203306ccfb7185da144ef232a6796c /ui/build | |
| parent | 420742638874a8d3799e7375a5cda5991d6edfd8 (diff) | |
| download | build_soong-5165ee989afa9752510e5d1eb8af4e9a44032827.tar.gz build_soong-5165ee989afa9752510e5d1eb8af4e9a44032827.tar.bz2 build_soong-5165ee989afa9752510e5d1eb8af4e9a44032827.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
Diffstat (limited to 'ui/build')
| -rw-r--r-- | ui/build/config.go | 2 |
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" } |