Merge "Remove armv5te"

am: 7d3e0709a5

Change-Id: Id032a1c917ca31313a15468ee8216b6b40cfc885

android/arch.go

@@ -923,8 +923,6 @@ type archConfig struct {
 
 func getMegaDeviceConfig() []archConfig {
 	return []archConfig{
-		// armv5 is only used for unbundled apps
-		//{"arm", "armv5te", "", []string{"armeabi"}},
 		{"arm", "armv7-a", "generic", []string{"armeabi-v7a"}},
 		{"arm", "armv7-a-neon", "generic", []string{"armeabi-v7a"}},
 		{"arm", "armv7-a-neon", "cortex-a7", []string{"armeabi-v7a"}},

cc/config/arm_device.go

@@ -49,14 +49,6 @@ var (
 	}
 
 	armArchVariantCflags = map[string][]string{
-		"armv5te": []string{
-			"-march=armv5te",
-			"-mtune=xscale",
-			"-D__ARM_ARCH_5__",
-			"-D__ARM_ARCH_5T__",
-			"-D__ARM_ARCH_5E__",
-			"-D__ARM_ARCH_5TE__",
-		},
 		"armv7-a": []string{
 			"-march=armv7-a",
 			"-mfloat-abi=softfp",
@@ -140,7 +132,6 @@ func init() {
 		"neon")
 
 	android.RegisterArchVariants(android.Arm,
-		"armv5te",
 		"armv7-a",
 		"armv7-a-neon",
 		"armv8-a",
@@ -188,7 +179,6 @@ func init() {
 	pctx.StaticVariable("ArmThumbCflags", strings.Join(armThumbCflags, " "))
 
 	// Architecture variant cflags
-	pctx.StaticVariable("ArmArmv5TECflags", strings.Join(armArchVariantCflags["armv5te"], " "))
 	pctx.StaticVariable("ArmArmv7ACflags", strings.Join(armArchVariantCflags["armv7-a"], " "))
 	pctx.StaticVariable("ArmArmv7ANeonCflags", strings.Join(armArchVariantCflags["armv7-a-neon"], " "))
 	pctx.StaticVariable("ArmArmv8ACflags", strings.Join(armArchVariantCflags["armv8-a"], " "))
@@ -213,8 +203,6 @@ func init() {
 	pctx.StaticVariable("ArmClangThumbCflags", strings.Join(ClangFilterUnknownCflags(armThumbCflags), " "))
 
 	// Clang arch variant cflags
-	pctx.StaticVariable("ArmClangArmv5TECflags",
-		strings.Join(armClangArchVariantCflags["armv5te"], " "))
 	pctx.StaticVariable("ArmClangArmv7ACflags",
 		strings.Join(armClangArchVariantCflags["armv7-a"], " "))
 	pctx.StaticVariable("ArmClangArmv7ANeonCflags",
@@ -241,7 +229,6 @@ func init() {
 
 var (
 	armArchVariantCflagsVar = map[string]string{
-		"armv5te":      "${config.ArmArmv5TECflags}",
 		"armv7-a":      "${config.ArmArmv7ACflags}",
 		"armv7-a-neon": "${config.ArmArmv7ANeonCflags}",
 		"armv8-a":      "${config.ArmArmv8ACflags}",
@@ -263,7 +250,6 @@ var (
 	}
 
 	armClangArchVariantCflagsVar = map[string]string{
-		"armv5te":      "${config.ArmClangArmv5TECflags}",
 		"armv7-a":      "${config.ArmClangArmv7ACflags}",
 		"armv7-a-neon": "${config.ArmClangArmv7ANeonCflags}",
 		"armv8-a":      "${config.ArmClangArmv8ACflags}",
@@ -399,8 +385,6 @@ func armToolchainFactory(arch android.Arch) Toolchain {
 		}
 	case "armv7-a":
 		fixCortexA8 = "-Wl,--fix-cortex-a8"
-	case "armv5te":
-		// Nothing extra for armv5te
 	case "armv8-a":
 		// Nothing extra for armv8-a
 	default:

ui/build/config.go

@@ -257,8 +257,6 @@ func (c *configImpl) Tapas(ctx Context, apps []string, arch, variant string) {
 
 	var product string
 	switch arch {
-	case "armv5":
-		product = "generic_armv5"
 	case "arm", "":
 		product = "aosp_arm"
 	case "arm64":