StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove (TARGET|HOST)_BUILD_TYPE path modifications

Browse Source 
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
This commit is contained in:
Dan Willemsen
2017-09-08 14:35:43 -07:00
parent 0bf1f85c48
commit 4dc4e14d15
1 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ui/build/config.go
View File

@@ -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 {