Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8818f499 authored by Dan Albert's avatar Dan Albert
Browse files

Revert "Remove armv7-a without neon support" 

Unfortunately we still need to build the NDK sysroot as non-NEON
since that's still supported, though it's no longer the default.

This reverts commit f4e0601c.

Test: treehugger
Test: rebuilt NDK sysroot and imported into the NDK, ran NDK tests
Bug: None
parent bce06b68

android/arch.go

+3 −1
Original line number Diff line number Diff line
@@ -107,6 +107,7 @@ module { 


var archVariants = map[ArchType][]string{

	Arm: {

		"armv7-a",

		"armv7-a-neon",

		"armv8-a",

		"armv8-2a",
@@ -1314,6 +1315,7 @@ type archConfig struct { 


func getMegaDeviceConfig() []archConfig {

	return []archConfig{

		{"arm", "armv7-a", "generic", []string{"armeabi-v7a"}},

		{"arm", "armv7-a-neon", "generic", []string{"armeabi-v7a"}},

		{"arm", "armv7-a-neon", "cortex-a7", []string{"armeabi-v7a"}},

		{"arm", "armv7-a-neon", "cortex-a8", []string{"armeabi-v7a"}},
@@ -1365,7 +1367,7 @@ func getMegaDeviceConfig() []archConfig { 


func getNdkAbisConfig() []archConfig {

	return []archConfig{

		{"arm", "armv7-a-neon", "", []string{"armeabi"}},

		{"arm", "armv7-a", "", []string{"armeabi"}},

		{"arm64", "armv8-a", "", []string{"arm64-v8a"}},

		{"x86", "", "", []string{"x86"}},

		{"x86_64", "", "", []string{"x86_64"}},

cc/config/arm_device.go

+10 −0
Original line number Diff line number Diff line
@@ -51,6 +51,11 @@ var ( 
	}



	armClangArchVariantCflags = map[string][]string{

		"armv7-a": []string{

			"-march=armv7-a",

			"-mfloat-abi=softfp",

			"-mfpu=vfpv3-d16",

		},

		"armv7-a-neon": []string{

			"-march=armv7-a",

			"-mfloat-abi=softfp",
@@ -184,6 +189,8 @@ func init() { 
	pctx.StaticVariable("ArmClangThumbCflags", strings.Join(ClangFilterUnknownCflags(armThumbCflags), " "))



	// Clang arch variant cflags

	pctx.StaticVariable("ArmClangArmv7ACflags",

		strings.Join(armClangArchVariantCflags["armv7-a"], " "))

	pctx.StaticVariable("ArmClangArmv7ANeonCflags",

		strings.Join(armClangArchVariantCflags["armv7-a-neon"], " "))

	pctx.StaticVariable("ArmClangArmv8ACflags",
@@ -212,6 +219,7 @@ func init() { 


var (

	armClangArchVariantCflagsVar = map[string]string{

		"armv7-a":      "${config.ArmClangArmv7ACflags}",

		"armv7-a-neon": "${config.ArmClangArmv7ANeonCflags}",

		"armv8-a":      "${config.ArmClangArmv8ACflags}",

		"armv8-2a":     "${config.ArmClangArmv82ACflags}",
@@ -327,6 +335,8 @@ func armToolchainFactory(arch android.Arch) Toolchain { 
		default:

			fixCortexA8 = "-Wl,--no-fix-cortex-a8"

		}

	case "armv7-a":

		fixCortexA8 = "-Wl,--fix-cortex-a8"

	case "armv8-a", "armv8-2a":

		// Nothing extra for armv8-a/armv8-2a

	default: