diff options
Diffstat (limited to 'cc')
| -rw-r--r-- | cc/cc.go | 2 | ||||
| -rw-r--r-- | cc/installer.go | 2 |
2 files changed, 3 insertions, 1 deletions
@@ -1804,6 +1804,8 @@ func (c *Module) depsToPaths(ctx android.ModuleContext) PathDeps { return libName + vendorPublicLibrarySuffix } else if ccDep.inRecovery() && !ccDep.onlyInRecovery() { return libName + recoverySuffix + } else if ccDep.Target().NativeBridge == android.NativeBridgeEnabled { + return libName + android.NativeBridgeSuffix } else { return libName } diff --git a/cc/installer.go b/cc/installer.go index bd8f9e791..cb261b739 100644 --- a/cc/installer.go +++ b/cc/installer.go @@ -66,7 +66,7 @@ func (installer *baseInstaller) installDir(ctx ModuleContext) android.OutputPath if ctx.toolchain().Is64Bit() && installer.dir64 != "" { dir = installer.dir64 } - if !ctx.Host() && !ctx.Arch().Native { + if (!ctx.Host() && !ctx.Arch().Native) || ctx.Target().NativeBridge == android.NativeBridgeEnabled { dir = filepath.Join(dir, ctx.Arch().ArchType.String()) } if installer.location == InstallInData && ctx.useVndk() { |