diff options
| author | Vishwath Mohan <vishwath@google.com> | 2017-06-08 03:02:25 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-06-08 03:02:25 +0000 |
| commit | 24f4655075708c57bd2f2ffc740314b25c389159 (patch) | |
| tree | a0688e58c0526f8e89a3f31c070f973e0e345b36 /android | |
| parent | 807f878f07519eea54cffd0dda7787e5bbf0cbb7 (diff) | |
| parent | 9132b17c4777cf613d65e0fb422c8540a1760ac8 (diff) | |
| download | build_soong-24f4655075708c57bd2f2ffc740314b25c389159.tar.gz build_soong-24f4655075708c57bd2f2ffc740314b25c389159.tar.bz2 build_soong-24f4655075708c57bd2f2ffc740314b25c389159.zip | |
Merge "Fix install path for sanitized native tests. (Soong)" am: d20ac72951
am: 9132b17c47
Change-Id: I4724d2113177e89352f20eb9284ebe4d04888204
Diffstat (limited to 'android')
| -rw-r--r-- | android/paths.go | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/android/paths.go b/android/paths.go index 26b72d17..aa06127f 100644 --- a/android/paths.go +++ b/android/paths.go @@ -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 { |