tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Native bridge modules are not translated second archs" am: 989d83ce1d

Browse source 
am: 1d7bb4fb21

Change-Id: Ibd70ff04a1016b0569be623da1e2e83961c1f71a
This commit is contained in:
dimitry 2019-05-22 21:19:09 -07:00 committed by android-build-merger
commit 962029a8c6
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
android/arch.go
View file

@ -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
} }
} }