diff options
Diffstat (limited to 'cc/installer.go')
| -rw-r--r-- | cc/installer.go | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/cc/installer.go b/cc/installer.go index a52ccf1fe..14b091ee0 100644 --- a/cc/installer.go +++ b/cc/installer.go @@ -66,11 +66,10 @@ func (installer *baseInstaller) installDir(ctx ModuleContext) android.OutputPath if ctx.toolchain().Is64Bit() && installer.dir64 != "" { dir = installer.dir64 } - if !ctx.Host() && !ctx.Arch().Native { - dir = filepath.Join(dir, ctx.Arch().ArchType.String()) - } if ctx.Target().NativeBridge == android.NativeBridgeEnabled { dir = filepath.Join(dir, ctx.Target().NativeBridgeRelativePath) + } else if !ctx.Host() && ctx.Config().HasMultilibConflict(ctx.Arch().ArchType) { + dir = filepath.Join(dir, ctx.Arch().ArchType.String()) } if installer.location == InstallInData && ctx.useVndk() { dir = filepath.Join(dir, "vendor") |