diff options
| author | Colin Cross <ccross@android.com> | 2019-09-18 21:12:18 +0000 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2019-09-18 21:12:31 +0000 |
| commit | 402be41aa8df98733a16eb8f96dd769dbe8c5d80 (patch) | |
| tree | ab7a4ef7ef80c556858c92a67881f6365558b777 /rust/compiler.go | |
| parent | fe6330c7d2d6102a0436da2892e71e3b490ac15c (diff) | |
| download | build_soong-402be41aa8df98733a16eb8f96dd769dbe8c5d80.tar.gz build_soong-402be41aa8df98733a16eb8f96dd769dbe8c5d80.tar.bz2 build_soong-402be41aa8df98733a16eb8f96dd769dbe8c5d80.zip | |
Revert "Remove old-style support for translated second architectures"
This reverts commit fe6330c7d2d6102a0436da2892e71e3b490ac15c.
Reason for revert: this was accidentally propping up NDK builds
Bug: 141242600
Change-Id: Ie9f8e31479a74e8e9e14d720a5936da6b1d5d113
Diffstat (limited to 'rust/compiler.go')
| -rw-r--r-- | rust/compiler.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/rust/compiler.go b/rust/compiler.go index 4e011832..87cf08b4 100644 --- a/rust/compiler.go +++ b/rust/compiler.go @@ -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, |