Merge "Native bridge modules are not translated second archs"
am: 989d83ce1d
Change-Id: I1d19696156877db75e7d6ba14edfd7d221865881
This commit is contained in:
@@ -1505,10 +1505,10 @@ func hasArmAbi(arch Arch) bool {
|
|||||||
return false
|
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 {
|
func hasArmAndroidArch(targets []Target) bool {
|
||||||
for _, target := range targets {
|
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
|
return true
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user