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

@@ -15,6 +15,8 @@
package python
import (
"path/filepath"
"android/soong/android"
)
@@ -50,6 +52,9 @@ func (installer *pythonInstaller) installDir(ctx android.ModuleContext) android.
if ctx.Arch().ArchType.Multilib == "lib64" && installer.dir64 != "" {
dir = installer.dir64
}
if !ctx.Host() && !ctx.Arch().Native {
dir = filepath.Join(dir, ctx.Arch().ArchType.String())
}
return android.PathForModuleInstall(ctx, dir, installer.relative)
}