diff options
| author | Adrian DC <radian.dc@gmail.com> | 2018-08-10 17:07:47 +0200 |
|---|---|---|
| committer | Carlos Solano <csolano@gmail.com> | 2018-09-01 13:29:11 +0200 |
| commit | a4c784f1e5a76f656e0e29699ff90527cf7976be (patch) | |
| tree | aa31e9c97d35ba22ae94d61e487c916448a7d350 | |
| parent | aedc526deae1b9dba41b0eb8610b1f59ee7961d7 (diff) | |
soong: Enforce absolute path if OUT_DIR is seto8.1
* 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 6cdcd12a0..34a493689 100644 --- a/ui/build/config.go +++ b/ui/build/config.go @@ -61,7 +61,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 { |