Commit 628db6fa authored May 22, 2019 by dimitry Committed by Dimitry Ivanov May 22, 2019

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

parent 6be6c2e4

android/arch.go

+2 −2

Original line number	Diff line number	Diff line
		@@ -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
		}
		}