From 3b19f5d71dbdbbf79a211f40ccfd39f42f2bc7ec Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Tue, 17 Sep 2019 14:45:31 -0700 Subject: Remove old-style support for translated second architectures Translated second architectures now go in NativeBridgeArch instead of DeviceSecondaryArch. This reapplies I568046330abc002d4eed582cb999b62a5eaba790 with ctx.Config().HasMulitlibConflict() added to fix the NDK build, which has arm64, arm, x86_64, and x86 architectures enabled. Test: m checkbuild Test: OUT_DIR=out_ndk build/soong/scripts/build-ndk-prebuilts.sh Test: no change to build.ninja or Android-aosp_cf_x86_phone.mk Change-Id: Iadcafbd64bfb9579ae7c86914927c43a062b0c8e --- python/installer.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'python/installer.go') diff --git a/python/installer.go b/python/installer.go index 62f36f4b5..ed16e143e 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) -- cgit v1.2.3-59-g8ed1b