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

Move arch variants registering code to arch.go.

Browse Source 
This enables using arch-dependent property values in modules defined in
android/.

Bug: 122332178
Test: Soong tests + TreeHugger
Change-Id: I89869e395fabf0e69f505b77eab8a4221384124e
This commit is contained in:
Jaewoong Jung
2019-01-16 14:33:13 -08:00
parent adf980bf91
commit e46114c11b
7 changed files with 209 additions and 198 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
cc/config/arm64_device.go
View File

@@ -86,20 +86,6 @@ const (
)
func init() {
android.RegisterArchVariants(android.Arm64,
"armv8_a",
"armv8_2a",
"cortex-a53",
"cortex-a55",
"cortex-a72",
"cortex-a73",
"cortex-a75",
"cortex-a76",
"kryo",
"kryo385",
"exynos-m1",
"exynos-m2")
pctx.StaticVariable("arm64GccVersion", arm64GccVersion)
pctx.SourcePathVariable("Arm64GccRoot",

29
cc/config/arm_device.go
View File

@@ -168,35 +168,6 @@ const (
)
func init() {
android.RegisterArchFeatures(android.Arm,
"neon")
android.RegisterArchVariants(android.Arm,
"armv7-a",
"armv7-a-neon",
"armv8-a",
"armv8-2a",
"cortex-a7",
"cortex-a8",
"cortex-a9",
"cortex-a15",
"cortex-a53",
"cortex-a53-a57",
"cortex-a55",
"cortex-a72",
"cortex-a73",
"cortex-a75",
"cortex-a76",
"krait",
"kryo",
"kryo385",
"exynos-m1",
"exynos-m2")
android.RegisterArchVariantFeatures(android.Arm, "armv7-a-neon", "neon")
android.RegisterArchVariantFeatures(android.Arm, "armv8-a", "neon")
android.RegisterArchVariantFeatures(android.Arm, "armv8-2a", "neon")
pctx.StaticVariable("armGccVersion", armGccVersion)
pctx.SourcePathVariable("ArmGccRoot",

9
cc/config/mips64_device.go
View File

@@ -55,15 +55,6 @@ const (
)
func init() {
android.RegisterArchVariants(android.Mips64,
"mips64r2",
"mips64r6")
android.RegisterArchFeatures(android.Mips64,
"rev6",
"msa")
android.RegisterArchVariantFeatures(android.Mips64, "mips64r6",
"rev6")
pctx.StaticVariable("mips64GccVersion", mips64GccVersion)
pctx.SourcePathVariable("Mips64GccRoot",

16
cc/config/mips_device.go
View File

@@ -89,22 +89,6 @@ const (
)
func init() {
android.RegisterArchVariants(android.Mips,
"mips32_fp",
"mips32r2_fp",
"mips32r2_fp_xburst",
"mips32r2dsp_fp",
"mips32r2dspr2_fp",
"mips32r6")
android.RegisterArchFeatures(android.Mips,
"dspr2",
"rev6",
"msa")
android.RegisterArchVariantFeatures(android.Mips, "mips32r2dspr2_fp",
"dspr2")
android.RegisterArchVariantFeatures(android.Mips, "mips32r6",
"rev6")
pctx.StaticVariable("mipsGccVersion", mipsGccVersion)
pctx.SourcePathVariable("MipsGccRoot",

42
cc/config/x86_64_device.go
View File

@@ -68,54 +68,12 @@ const (
)
func init() {
android.RegisterArchVariants(android.X86_64,
"haswell",
"ivybridge",
"sandybridge",
"silvermont")
android.RegisterArchFeatures(android.X86_64,
"ssse3",
"sse4",
"sse4_1",
"sse4_2",
"aes_ni",
"avx",
"popcnt")
android.RegisterDefaultArchVariantFeatures(android.Android, android.X86_64,
"ssse3",
"sse4",
"sse4_1",
"sse4_2",
"popcnt")
android.RegisterArchVariantFeatures(android.X86_64, "haswell",
"ssse3",
"sse4",
"sse4_1",
"sse4_2",
"aes_ni",
"avx",
"popcnt")
android.RegisterArchVariantFeatures(android.X86_64, "ivybridge",
"ssse3",
"sse4",
"sse4_1",
"sse4_2",
"aes_ni",
"avx",
"popcnt")
android.RegisterArchVariantFeatures(android.X86_64, "sandybridge",
"ssse3",
"sse4",
"sse4_1",
"sse4_2",
"popcnt")
android.RegisterArchVariantFeatures(android.X86_64, "silvermont",
"ssse3",
"sse4",
"sse4_1",
"sse4_2",
"aes_ni",
"popcnt")
pctx.StaticVariable("x86_64GccVersion", x86_64GccVersion)

57
cc/config/x86_device.go
View File

@@ -84,63 +84,6 @@ const (
)
func init() {
android.RegisterArchVariants(android.X86,
"atom",
"haswell",
"ivybridge",
"sandybridge",
"silvermont",
"x86_64")
android.RegisterArchFeatures(android.X86,
"ssse3",
"sse4",
"sse4_1",
"sse4_2",
"aes_ni",
"avx",
"popcnt",
"movbe")
android.RegisterArchVariantFeatures(android.X86, "x86_64",
"ssse3",
"sse4",
"sse4_1",
"sse4_2",
"popcnt")
android.RegisterArchVariantFeatures(android.X86, "atom",
"ssse3",
"movbe")
android.RegisterArchVariantFeatures(android.X86, "haswell",
"ssse3",
"sse4",
"sse4_1",
"sse4_2",
"aes_ni",
"avx",
"popcnt",
"movbe")
android.RegisterArchVariantFeatures(android.X86, "ivybridge",
"ssse3",
"sse4",
"sse4_1",
"sse4_2",
"aes_ni",
"avx",
"popcnt")
android.RegisterArchVariantFeatures(android.X86, "sandybridge",
"ssse3",
"sse4",
"sse4_1",
"sse4_2",
"popcnt")
android.RegisterArchVariantFeatures(android.X86, "silvermont",
"ssse3",
"sse4",
"sse4_1",
"sse4_2",
"aes_ni",
"popcnt",
"movbe")
pctx.StaticVariable("x86GccVersion", x86GccVersion)
pctx.SourcePathVariable("X86GccRoot",