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
diff --git a/python/installer.go b/python/installer.go
index 22c06c2..62f36f4 100644
--- a/python/installer.go
+++ b/python/installer.go
@@ -15,6 +15,8 @@
package python
import (
+ "path/filepath"
+
"android/soong/android"
)
@@ -50,6 +52,9 @@
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)
}