Revert "Remove old-style support for translated second architectures"
This reverts commit fe6330c7d2d6102a0436da2892e71e3b490ac15c.
Reason for revert: this was accidentally propping up NDK builds
Bug: 141242600
Change-Id: Ie9f8e31479a74e8e9e14d720a5936da6b1d5d113
diff --git a/android/arch.go b/android/arch.go
index b038956..907c58b 100644
--- a/android/arch.go
+++ b/android/arch.go
@@ -527,6 +527,7 @@
CpuVariant string
Abi []string
ArchFeatures []string
+ Native bool
}
func (a Arch) String() string {
@@ -1481,6 +1482,11 @@
addTarget(Android, *variables.DeviceSecondaryArch,
variables.DeviceSecondaryArchVariant, variables.DeviceSecondaryCpuVariant,
variables.DeviceSecondaryAbi, NativeBridgeDisabled, nil, nil)
+
+ deviceArches := targets[Android]
+ if deviceArches[0].Arch.ArchType.Multilib == deviceArches[1].Arch.ArchType.Multilib {
+ deviceArches[1].Arch.Native = false
+ }
}
if variables.NativeBridgeArch != nil && *variables.NativeBridgeArch != "" {
@@ -1628,7 +1634,7 @@
if err != nil {
return nil, err
}
-
+ arch.Native = false
ret = append(ret, Target{
Os: Android,
Arch: arch,
@@ -1657,6 +1663,7 @@
ArchVariant: stringPtr(archVariant),
CpuVariant: stringPtr(cpuVariant),
Abi: abi,
+ Native: true,
}
if a.ArchVariant == a.ArchType.Name || a.ArchVariant == "generic" {