diff options
| author | Adrian DC <radian.dc@gmail.com> | 2018-08-10 17:07:47 +0200 |
|---|---|---|
| committer | Adrian DC <radian.dc@gmail.com> | 2018-08-31 21:42:28 +0200 |
| commit | 27806ce6f0f574d79ba0b04f3bb0bc94dce27352 (patch) | |
| tree | 1c0a39fca7a8baf48818d9c7a9c9b5a08b21d5fa | |
| parent | b7be57e48a9ed96005557b7d3dea0267f4800be6 (diff) | |
| download | build_soong-27806ce6f0f574d79ba0b04f3bb0bc94dce27352.tar.gz build_soong-27806ce6f0f574d79ba0b04f3bb0bc94dce27352.tar.bz2 build_soong-27806ce6f0f574d79ba0b04f3bb0bc94dce27352.zip | |
soong: Enforce absolute path if OUT_DIR is set
* Follows "soong: use absolute path for OUT_DIR"
to resolve inline kernel building when
export OUT_DIR=out or =out_name
Change-Id: I6560ec163cc6508f211bb1cd65d565015141d79b
| -rw-r--r-- | ui/build/config.go | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/ui/build/config.go b/ui/build/config.go index a54ed82b..f95eb646 100644 --- a/ui/build/config.go +++ b/ui/build/config.go @@ -65,7 +65,11 @@ func NewConfig(ctx Context, args ...string) Config { // Make sure OUT_DIR is set appropriately if outDir, ok := ret.environ.Get("OUT_DIR"); ok { - ret.environ.Set("OUT_DIR", filepath.Clean(outDir)) + outDir := filepath.Clean(outDir) + if (!filepath.IsAbs(outDir)) { + outDir = filepath.Join(os.Getenv("TOP"), outDir) + } + ret.environ.Set("OUT_DIR", outDir) } else { outDir := "out" if baseDir, ok := ret.environ.Get("OUT_DIR_COMMON_BASE"); ok { |