From 628db6faa411b896e25ac86af1320a9f8eb1de42 Mon Sep 17 00:00:00 2001 From: dimitry Date: Wed, 22 May 2019 17:16:21 +0200 Subject: [PATCH] Native bridge modules are not translated second archs Ignore native_bridge targets when detecting whether second architecture is translated or not. The concept of second translated architectures is almost deprected and will be removed once all affected products are switched to native_bridge support from the build system. Bug: http://b/77159578 Test: make 4arch target Change-Id: Ife93ccc60f5c1a4020f66b2cf862b709889d9d6b --- android/arch.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/android/arch.go b/android/arch.go index c68fe4667..68fc149fe 100644 --- a/android/arch.go +++ b/android/arch.go @@ -1505,10 +1505,10 @@ func hasArmAbi(arch Arch) bool { return false } -// hasArmArch returns true if targets has at least arm Android arch +// hasArmArch returns true if targets has at least non-native_bridge arm Android arch func hasArmAndroidArch(targets []Target) bool { for _, target := range targets { - if target.Os == Android && target.Arch.ArchType == Arm { + if target.Os == Android && target.Arch.ArchType == Arm && target.NativeBridge == NativeBridgeDisabled { return true } }