Revert "Remove old-style support for translated second architectures"

This reverts commit fe6330c7d2.

Reason for revert: this was accidentally propping up NDK builds
Bug: 141242600
Change-Id: Ie9f8e31479a74e8e9e14d720a5936da6b1d5d113
This commit is contained in:
Colin Cross
2019-09-18 21:12:18 +00:00
parent fe6330c7d2
commit 402be41aa8
11 changed files with 58 additions and 18 deletions

View File

@@ -157,7 +157,7 @@ func (compiler *baseCompiler) installDir(ctx ModuleContext) android.OutputPath {
if ctx.toolchain().Is64Bit() && compiler.dir64 != "" {
dir = compiler.dir64
}
if !ctx.Host() || ctx.Target().NativeBridge == android.NativeBridgeEnabled {
if (!ctx.Host() && !ctx.Arch().Native) || ctx.Target().NativeBridge == android.NativeBridgeEnabled {
dir = filepath.Join(dir, ctx.Arch().ArchType.String())
}
return android.PathForModuleInstall(ctx, dir, compiler.subDir,