diff options
| author | 2019-09-18 21:12:18 +0000 | |
|---|---|---|
| committer | 2019-09-18 21:12:31 +0000 | |
| commit | 402be41aa8df98733a16eb8f96dd769dbe8c5d80 (patch) | |
| tree | ab7a4ef7ef80c556858c92a67881f6365558b777 /python/installer.go | |
| parent | fe6330c7d2d6102a0436da2892e71e3b490ac15c (diff) | |
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 'python/installer.go')
| -rw-r--r-- | python/installer.go | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/python/installer.go b/python/installer.go index 22c06c24d..62f36f4b5 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 @@ 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) } |