tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Fix install path for sanitized native tests. (Soong)"

Browse source 
am: d20ac72951

Change-Id: I3a9594efb1637624bf088d92b3d9731436c0c124
This commit is contained in:
Vishwath Mohan 2017-06-08 02:59:53 +00:00 committed by android-build-merger
commit 9132b17c47
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
android/paths.go
View file

@ -672,15 +672,17 @@ func PathForModuleRes(ctx ModuleContext, pathComponents ...string) ModuleResPath
func PathForModuleInstall(ctx ModuleContext, pathComponents ...string) OutputPath { func PathForModuleInstall(ctx ModuleContext, pathComponents ...string) OutputPath {
var outPaths []string var outPaths []string
if ctx.Device() { if ctx.Device() {
partition := "system" var partition string
if ctx.Vendor() { if ctx.Vendor() {
partition = ctx.DeviceConfig().VendorPath() partition = ctx.DeviceConfig().VendorPath()
} else if ctx.InstallInData() {
partition = "data"
} else {
partition = "system"
} }
if ctx.InstallInSanitizerDir() { if ctx.InstallInSanitizerDir() {
partition = "data/asan/" + partition partition = "data/asan/" + partition
} else if ctx.InstallInData() {
partition = "data"
} }
outPaths = []string{"target", "product", ctx.AConfig().DeviceName(), partition} outPaths = []string{"target", "product", ctx.AConfig().DeviceName(), partition}
} else { } else {