diff options
Diffstat (limited to 'android/arch.go')
| -rw-r--r-- | android/arch.go | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/android/arch.go b/android/arch.go index 907c58b82..b0389560b 100644 --- a/android/arch.go +++ b/android/arch.go @@ -527,7 +527,6 @@ type Arch struct { CpuVariant string Abi []string ArchFeatures []string - Native bool } func (a Arch) String() string { @@ -1482,11 +1481,6 @@ func decodeTargetProductVariables(config *config) (map[OsType][]Target, error) { 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 != "" { @@ -1634,7 +1628,7 @@ func decodeArchSettings(os OsType, archConfigs []archConfig) ([]Target, error) { if err != nil { return nil, err } - arch.Native = false + ret = append(ret, Target{ Os: Android, Arch: arch, @@ -1663,7 +1657,6 @@ func decodeArch(os OsType, arch string, archVariant, cpuVariant *string, abi []s ArchVariant: stringPtr(archVariant), CpuVariant: stringPtr(cpuVariant), Abi: abi, - Native: true, } if a.ArchVariant == a.ArchType.Name || a.ArchVariant == "generic" { |