diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2017-09-08 14:35:43 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@google.com> | 2017-09-08 21:47:31 +0000 |
| commit | 4dc4e14d1541778ae2477c0c8942b31d50675630 (patch) | |
| tree | ec8396f94ceca69e29b672b6919e3ce28a2d0ff4 /ui | |
| parent | 0bf1f85c489d3b649c3f5fd9d064586ed3376a36 (diff) | |
| download | build_soong-4dc4e14d1541778ae2477c0c8942b31d50675630.tar.gz build_soong-4dc4e14d1541778ae2477c0c8942b31d50675630.tar.bz2 build_soong-4dc4e14d1541778ae2477c0c8942b31d50675630.zip | |
Remove (TARGET|HOST)_BUILD_TYPE path modifications
They don't really affect anything general in android except for the
output path.
Bug: 65453318
Test: TARGET_BUILD_TYPE=debug m
Change-Id: I98c17fefae61f9f7936e184bd1f8441086bb7d23
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/build/config.go | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/ui/build/config.go b/ui/build/config.go index 1c2f73be..2b0da4dc 100644 --- a/ui/build/config.go +++ b/ui/build/config.go @@ -403,11 +403,7 @@ func (c *configImpl) SoongMakeVarsMk() string { } func (c *configImpl) ProductOut() string { - if buildType, ok := c.environ.Get("TARGET_BUILD_TYPE"); ok && buildType == "debug" { - return filepath.Join(c.OutDir(), "debug", "target", "product", c.TargetDevice()) - } else { - return filepath.Join(c.OutDir(), "target", "product", c.TargetDevice()) - } + return filepath.Join(c.OutDir(), "target", "product", c.TargetDevice()) } func (c *configImpl) DevicePreviousProductConfig() string { @@ -415,11 +411,7 @@ func (c *configImpl) DevicePreviousProductConfig() string { } func (c *configImpl) hostOutRoot() string { - if buildType, ok := c.environ.Get("HOST_BUILD_TYPE"); ok && buildType == "debug" { - return filepath.Join(c.OutDir(), "debug", "host") - } else { - return filepath.Join(c.OutDir(), "host") - } + return filepath.Join(c.OutDir(), "host") } func (c *configImpl) HostOut() string { |