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

2019-10-07 20:48:07 +00:00
parent bd7c98ce22 3b19f5d71d
commit c6136c9d65
11 changed files with 40 additions and 56 deletions
--- a/rust/compiler.go
+++ b/rust/compiler.go
@@ -184,7 +184,7 @@ func (compiler *baseCompiler) installDir(ctx ModuleContext) android.InstallPath
 	if ctx.toolchain().Is64Bit() && compiler.dir64 != "" {
 		dir = compiler.dir64
 	}
-	if (!ctx.Host() && !ctx.Arch().Native) || ctx.Target().NativeBridge == android.NativeBridgeEnabled {
+	if !ctx.Host() || ctx.Target().NativeBridge == android.NativeBridgeEnabled {
 		dir = filepath.Join(dir, ctx.Arch().ArchType.String())
 	}
 	return android.PathForModuleInstall(ctx, dir, compiler.subDir,