diff options
| author | 2019-09-17 14:45:31 -0700 | |
|---|---|---|
| committer | 2019-09-19 12:54:32 -0700 | |
| commit | 3b19f5d71dbdbbf79a211f40ccfd39f42f2bc7ec (patch) | |
| tree | 8559295a723d8b002755fba3645e44ed620ca071 /android/arch.go | |
| parent | 1f6c94a3ac5cc86c81a3a8e9ed5561d0e1e9c5fc (diff) | |
Remove old-style support for translated second architectures
Translated second architectures now go in NativeBridgeArch instead
of DeviceSecondaryArch.
This reapplies I568046330abc002d4eed582cb999b62a5eaba790 with
ctx.Config().HasMulitlibConflict() added to fix the NDK build,
which has arm64, arm, x86_64, and x86 architectures enabled.
Test: m checkbuild
Test: OUT_DIR=out_ndk build/soong/scripts/build-ndk-prebuilts.sh
Test: no change to build.ninja or Android-aosp_cf_x86_phone.mk
Change-Id: Iadcafbd64bfb9579ae7c86914927c43a062b0c8e
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" { |