Merge "Fix install path for sanitized native tests. (Soong)"
am: d20ac72951
Change-Id: I3a9594efb1637624bf088d92b3d9731436c0c124
This commit is contained in:
commit
9132b17c47
1 changed files with 5 additions and 3 deletions
|
@ -672,15 +672,17 @@ func PathForModuleRes(ctx ModuleContext, pathComponents ...string) ModuleResPath
|
|||
func PathForModuleInstall(ctx ModuleContext, pathComponents ...string) OutputPath {
|
||||
var outPaths []string
|
||||
if ctx.Device() {
|
||||
partition := "system"
|
||||
var partition string
|
||||
if ctx.Vendor() {
|
||||
partition = ctx.DeviceConfig().VendorPath()
|
||||
} else if ctx.InstallInData() {
|
||||
partition = "data"
|
||||
} else {
|
||||
partition = "system"
|
||||
}
|
||||
|
||||
if ctx.InstallInSanitizerDir() {
|
||||
partition = "data/asan/" + partition
|
||||
} else if ctx.InstallInData() {
|
||||
partition = "data"
|
||||
}
|
||||
outPaths = []string{"target", "product", ctx.AConfig().DeviceName(), partition}
|
||||
} else {
|
||||
|
|
Loading…
Reference in a new issue