diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2019-10-07 20:48:07 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-10-07 20:48:07 +0000 |
| commit | c6136c9d65fa9afae4d1e1ec57c62914c3b7ae6d (patch) | |
| tree | 45060d29368c5a043bdd42723b16e4e5a4686f25 /python | |
| parent | bd7c98ce229ca65e2a941a82b352e8d16f8f1faf (diff) | |
| parent | 3b19f5d71dbdbbf79a211f40ccfd39f42f2bc7ec (diff) | |
| download | build_soong-c6136c9d65fa9afae4d1e1ec57c62914c3b7ae6d.tar.gz build_soong-c6136c9d65fa9afae4d1e1ec57c62914c3b7ae6d.tar.bz2 build_soong-c6136c9d65fa9afae4d1e1ec57c62914c3b7ae6d.zip | |
Merge "Remove old-style support for translated second architectures"
Diffstat (limited to 'python')
| -rw-r--r-- | python/installer.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/python/installer.go b/python/installer.go index b0a25b9b..396f0366 100644 --- a/python/installer.go +++ b/python/installer.go @@ -52,7 +52,7 @@ 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 { + if !ctx.Host() && ctx.Config().HasMultilibConflict(ctx.Arch().ArchType) { dir = filepath.Join(dir, ctx.Arch().ArchType.String()) } return android.PathForModuleInstall(ctx, dir, installer.relative) |