StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove armv5te

Browse Source 
This architecture only existed for unbundled use, but even the NDK is
removing support in their r17 release, so just remove support for it.

Test: build/soong/build_test.bash -only-soong
Change-Id: I4bd23babf567128d2d242cbdee3311abb198dd7c
This commit is contained in:
Dan Willemsen
2018-01-08 15:47:03 -08:00
parent e6f4ee2061
commit e401a8315e
3 changed files with 0 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
android/arch.go
View File

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

16
cc/config/arm_device.go
View File

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

2
ui/build/config.go
View File

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