move arch variant structs down a level
Use blueprint's new anonymous embedded struct feature to move the arch variant properties down a level, replacing arch.cortex_a9.srcs with arch.arm.cortex_a9.srcs, while still supporting top-level properties like arch.arm.srcs. Change-Id: Ib41c80e3549440d5efdfd293a15cffa3f51a0fe4
This commit is contained in:
Colin Cross
parent
9c6157c81d
commit
6ab8f89d1c
@ -311,24 +311,24 @@ cc_library_static {
|
||||
"upstream-freebsd/lib/libc/string/wcslen.c",
|
||||
"upstream-freebsd/lib/libc/string/wcsrchr.c",
|
||||
],
|
||||
},
|
||||
atom: {
|
||||
exclude_srcs: [
|
||||
"upstream-freebsd/lib/libc/string/wmemcmp.c",
|
||||
],
|
||||
},
|
||||
x86_ssse3: {
|
||||
ssse3: {
|
||||
exclude_srcs: [
|
||||
"upstream-freebsd/lib/libc/string/wcscat.c",
|
||||
"upstream-freebsd/lib/libc/string/wcscpy.c",
|
||||
],
|
||||
},
|
||||
x86_sse4: {
|
||||
sse4: {
|
||||
exclude_srcs: [
|
||||
"upstream-freebsd/lib/libc/string/wmemcmp.c",
|
||||
],
|
||||
},
|
||||
},
|
||||
},
|
||||
|
||||
cflags: [
|
||||
"-Wno-sign-compare",
|
||||
@ -651,7 +651,6 @@ cc_library_static {
|
||||
exclude_srcs: [
|
||||
"upstream-openbsd/lib/libc/string/strcpy.c",
|
||||
],
|
||||
},
|
||||
cortex_a7: {
|
||||
exclude_srcs: [
|
||||
"upstream-openbsd/lib/libc/string/memmove.c",
|
||||
@ -708,7 +707,7 @@ cc_library_static {
|
||||
"upstream-openbsd/lib/libc/string/strcat.c",
|
||||
],
|
||||
},
|
||||
|
||||
},
|
||||
arm64: {
|
||||
exclude_srcs: [
|
||||
"upstream-openbsd/lib/libc/string/memchr.c",
|
||||
@ -731,14 +730,14 @@ cc_library_static {
|
||||
"upstream-openbsd/lib/libc/string/strncmp.c",
|
||||
"upstream-openbsd/lib/libc/string/strncpy.c",
|
||||
],
|
||||
},
|
||||
x86_ssse3: {
|
||||
ssse3: {
|
||||
exclude_srcs: [
|
||||
"upstream-openbsd/lib/libc/string/strlcat.c",
|
||||
"upstream-openbsd/lib/libc/string/strlcpy.c",
|
||||
"upstream-openbsd/lib/libc/string/strncat.c",
|
||||
],
|
||||
},
|
||||
},
|
||||
|
||||
x86_64: {
|
||||
exclude_srcs: [
|
||||
@ -805,7 +804,7 @@ cc_library_static {
|
||||
],
|
||||
multilib: {
|
||||
lib64: {
|
||||
srcs: ["upstream-openbsd/lib/libc/gdtoa/strtorQ.c"]
|
||||
srcs: ["upstream-openbsd/lib/libc/gdtoa/strtorQ.c"],
|
||||
},
|
||||
},
|
||||
|
||||
@ -884,7 +883,6 @@ cc_library_static {
|
||||
"bionic/__memcpy_chk.cpp",
|
||||
"bionic/__memset_chk.cpp",
|
||||
],
|
||||
},
|
||||
cortex_a7: {
|
||||
srcs: [
|
||||
"arch-arm/cortex-a7/bionic/memset.S",
|
||||
@ -1084,6 +1082,7 @@ cc_library_static {
|
||||
],
|
||||
},
|
||||
|
||||
},
|
||||
arm64: {
|
||||
srcs: [
|
||||
"arch-arm64/bionic/__bionic_clone.S",
|
||||
@ -1112,7 +1111,6 @@ cc_library_static {
|
||||
"bionic/strchr.cpp",
|
||||
"bionic/strnlen.c",
|
||||
],
|
||||
},
|
||||
denver64: {
|
||||
srcs: [
|
||||
"arch-arm64/denver64/bionic/memcpy.S",
|
||||
@ -1123,6 +1121,7 @@ cc_library_static {
|
||||
"arch-arm64/generic/bionic/memset.S",
|
||||
],
|
||||
},
|
||||
},
|
||||
|
||||
mips: {
|
||||
srcs: [
|
||||
@ -1140,16 +1139,15 @@ cc_library_static {
|
||||
"arch-mips/string/strcmp.S",
|
||||
"arch-mips/string/strlen.c",
|
||||
],
|
||||
},
|
||||
mips_rev6: {
|
||||
rev6: {
|
||||
srcs: [
|
||||
"arch-mips/string/mips_strlen.c"
|
||||
"arch-mips/string/mips_strlen.c",
|
||||
],
|
||||
exclude_srcs: [
|
||||
"arch-mips/string/strlen.c"
|
||||
"arch-mips/string/strlen.c",
|
||||
],
|
||||
},
|
||||
|
||||
},
|
||||
mips64: {
|
||||
srcs: [
|
||||
"arch-mips64/bionic/__bionic_clone.S",
|
||||
@ -1208,7 +1206,6 @@ cc_library_static {
|
||||
"bionic/strnlen.c",
|
||||
"bionic/strrchr.cpp",
|
||||
],
|
||||
},
|
||||
atom: {
|
||||
srcs: [
|
||||
"arch-x86/atom/string/sse2-bzero-atom.S",
|
||||
@ -1232,7 +1229,7 @@ cc_library_static {
|
||||
"arch-x86/silvermont/string/sse2-strncpy-slm.S",
|
||||
],
|
||||
},
|
||||
x86_ssse3: {
|
||||
ssse3: {
|
||||
srcs: [
|
||||
"arch-x86/atom/string/ssse3-strncat-atom.S",
|
||||
"arch-x86/atom/string/ssse3-strlcat-atom.S",
|
||||
@ -1249,7 +1246,7 @@ cc_library_static {
|
||||
"arch-x86/generic/string/strcat.S",
|
||||
],
|
||||
},
|
||||
x86_sse4: {
|
||||
sse4: {
|
||||
srcs: [
|
||||
"arch-x86/silvermont/string/sse4-memcmp-slm.S",
|
||||
"arch-x86/silvermont/string/sse4-wmemcmp-slm.S",
|
||||
@ -1258,7 +1255,7 @@ cc_library_static {
|
||||
"arch-x86/generic/string/memcmp.S",
|
||||
],
|
||||
},
|
||||
|
||||
},
|
||||
x86_64: {
|
||||
srcs: [
|
||||
"arch-x86_64/bionic/__bionic_clone.S",
|
||||
@ -1447,7 +1444,7 @@ cc_library_static {
|
||||
multilib: {
|
||||
lib32: {
|
||||
// LP32 cruft
|
||||
srcs: ["bionic/mmap.cpp"]
|
||||
srcs: ["bionic/mmap.cpp"],
|
||||
},
|
||||
},
|
||||
|
||||
@ -2024,7 +2021,10 @@ cc_object {
|
||||
},
|
||||
srcs: ["arch-common/bionic/crtbrand.S"],
|
||||
|
||||
defaults: ["crt_defaults", "crt_so_defaults"],
|
||||
defaults: [
|
||||
"crt_defaults",
|
||||
"crt_so_defaults",
|
||||
],
|
||||
}
|
||||
|
||||
// Android.mk:ignore
|
||||
@ -2033,14 +2033,20 @@ cc_object {
|
||||
local_include_dirs: ["include"],
|
||||
srcs: ["arch-common/bionic/crtbegin_so.c"],
|
||||
|
||||
defaults: ["crt_defaults", "crt_so_defaults"],
|
||||
defaults: [
|
||||
"crt_defaults",
|
||||
"crt_so_defaults",
|
||||
],
|
||||
}
|
||||
|
||||
// Android.mk:ignore
|
||||
cc_object {
|
||||
name: "crtbegin_so",
|
||||
|
||||
defaults: ["crt_defaults", "crt_so_defaults"],
|
||||
defaults: [
|
||||
"crt_defaults",
|
||||
"crt_so_defaults",
|
||||
],
|
||||
deps: [
|
||||
"crtbegin_so1",
|
||||
"crtbrand",
|
||||
@ -2053,7 +2059,10 @@ cc_object {
|
||||
local_include_dirs: ["include"],
|
||||
srcs: ["arch-common/bionic/crtend_so.S"],
|
||||
|
||||
defaults: ["crt_defaults", "crt_so_defaults"],
|
||||
defaults: [
|
||||
"crt_defaults",
|
||||
"crt_so_defaults",
|
||||
],
|
||||
}
|
||||
|
||||
// Android.mk:ignore
|
||||
|
||||
Loading…
Reference in New Issue
Block a user