generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Use exclude_srcs instead of "-file"" into master-soong

Browse Source
This commit is contained in:
Dan Willemsen
2015-07-06 19:52:25 +00:00
committed by Gerrit Code Review
parent dab6ead2aa 7454daa97f
commit 87e33892fc
2 changed files with 67 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
libc/Android.bp
View File

@@ -788,8 +788,8 @@ cc_library_static {
srcs: libc_upstream_freebsd_src_files,
arch: {
arm64: {
srcs: [
"-upstream-freebsd/lib/libc/string/wmemmove.c",
exclude_srcs: [
"upstream-freebsd/lib/libc/string/wmemmove.c",
],
},
arm: {
@@ -885,21 +885,21 @@ cc_library_static {
arch: {
arm64: {
srcs: [
"-upstream-openbsd/lib/libc/string/memchr.c",
"-upstream-openbsd/lib/libc/string/memmove.c",
"-upstream-openbsd/lib/libc/string/stpcpy.c",
"-upstream-openbsd/lib/libc/string/strcmp.c",
"-upstream-openbsd/lib/libc/string/strcpy.c",
"-upstream-openbsd/lib/libc/string/strncmp.c",
exclude_srcs: [
"upstream-openbsd/lib/libc/string/memchr.c",
"upstream-openbsd/lib/libc/string/memmove.c",
"upstream-openbsd/lib/libc/string/stpcpy.c",
"upstream-openbsd/lib/libc/string/strcmp.c",
"upstream-openbsd/lib/libc/string/strcpy.c",
"upstream-openbsd/lib/libc/string/strncmp.c",
],
},
arm: {
srcs: [
"-upstream-openbsd/lib/libc/string/stpcpy.c",
"-upstream-openbsd/lib/libc/string/strcat.c",
"-upstream-openbsd/lib/libc/string/strcmp.c",
"-upstream-openbsd/lib/libc/string/strcpy.c",
exclude_srcs: [
"upstream-openbsd/lib/libc/string/stpcpy.c",
"upstream-openbsd/lib/libc/string/strcat.c",
"upstream-openbsd/lib/libc/string/strcmp.c",
"upstream-openbsd/lib/libc/string/strcpy.c",
],
},
},
@@ -1060,9 +1060,6 @@ cc_library_static {
"arch-arm64/bionic/syscall.S",
"arch-arm64/bionic/vfork.S",
"-bionic/__memcpy_chk.cpp",
"-bionic/strchr.cpp",
"-bionic/strnlen.c",
"arch-arm64/generic/bionic/memchr.S",
"arch-arm64/generic/bionic/memcmp.S",
"arch-arm64/generic/bionic/memcpy.S",
@@ -1077,15 +1074,16 @@ cc_library_static {
"arch-arm64/generic/bionic/strnlen.S",
"arch-arm64/generic/bionic/wmemmove.S",
],
exclude_srcs: [
"bionic/__memcpy_chk.cpp",
"bionic/strchr.cpp",
"bionic/strnlen.c",
],
},
arm: {
// memcpy.S, memchr.S, etc. do not compile with Clang.
clang_asflags: ["-no-integrated-as"],
srcs: [
"-bionic/__memcpy_chk.cpp",
"-bionic/__memset_chk.cpp",
"-bionic/__strcat_chk.cpp",
"-bionic/__strcpy_chk.cpp",
"arch-arm/bionic/abort_arm.S",
"arch-arm/bionic/atomics_arm.c",
"arch-arm/bionic/__bionic_clone.S",
@@ -1105,6 +1103,12 @@ cc_library_static {
"arch-arm/cortex-a15/bionic/__strcpy_chk.S",
"arch-arm/cortex-a15/bionic/strlen.S",
],
exclude_srcs: [
"bionic/__memcpy_chk.cpp",
"bionic/__memset_chk.cpp",
"bionic/__strcat_chk.cpp",
"bionic/__strcpy_chk.cpp",
],
},
},
multilib: {
@@ -1743,21 +1747,27 @@ cc_object {
arch: crt_arch_flags + {
arm64: {
srcs: [
"-arch-common/bionic/crtbegin.c",
"arch-arm64/bionic/crtbegin.c",
],
exclude_srcs: [
"arch-common/bionic/crtbegin.c",
],
},
mips: {
srcs: [
"-arch-common/bionic/crtbegin.c",
"arch-mips/bionic/crtbegin.c",
],
exclude_srcs: [
"arch-common/bionic/crtbegin.c",
],
},
mips64: {
srcs: [
"-arch-common/bionic/crtbegin.c",
"arch-mips64/bionic/crtbegin.c",
],
exclude_srcs: [
"arch-common/bionic/crtbegin.c",
],
},
},
}
@@ -1782,21 +1792,27 @@ cc_object {
arch: crt_arch_flags + {
arm64: {
srcs: [
"-arch-common/bionic/crtbegin.c",
"arch-arm64/bionic/crtbegin.c",
],
exclude_srcs: [
"arch-common/bionic/crtbegin.c",
],
},
mips: {
srcs: [
"-arch-common/bionic/crtbegin.c",
"arch-mips/bionic/crtbegin.c",
],
exclude_srcs: [
"arch-common/bionic/crtbegin.c",
],
},
mips64: {
srcs: [
"-arch-common/bionic/crtbegin.c",
"arch-mips64/bionic/crtbegin.c",
],
exclude_srcs: [
"arch-common/bionic/crtbegin.c",
],
},
},
}

44
libm/Android.bp
View File

@@ -310,43 +310,47 @@ cc_library {
arm: {
srcs: [
"arm/fenv.c",
// TODO: these require neon not available in arm
"-upstream-freebsd/lib/msun/src/e_sqrt.c",
"arm/e_sqrt.S",
"-upstream-freebsd/lib/msun/src/e_sqrtf.c",
"arm/e_sqrtf.S",
"-upstream-freebsd/lib/msun/src/s_floor.c",
"arm/s_floor.S",
],
exclude_srcs: [
// TODO: these require neon not available in arm
"upstream-freebsd/lib/msun/src/e_sqrt.c",
"upstream-freebsd/lib/msun/src/e_sqrtf.c",
"upstream-freebsd/lib/msun/src/s_floor.c",
]
},
arm64: {
srcs: [
"arm64/fenv.c",
"-upstream-freebsd/lib/msun/src/s_ceil.c",
"-upstream-freebsd/lib/msun/src/s_ceilf.c",
"arm64/ceil.S",
"-upstream-freebsd/lib/msun/src/s_fma.c",
"-upstream-freebsd/lib/msun/src/s_fmaf.c",
"arm64/fma.S",
"-upstream-freebsd/lib/msun/src/s_floor.c",
"-upstream-freebsd/lib/msun/src/s_floorf.c",
"arm64/floor.S",
"-upstream-freebsd/lib/msun/src/s_llrint.c",
"-upstream-freebsd/lib/msun/src/s_llrintf.c",
"-upstream-freebsd/lib/msun/src/s_lrint.c",
"-upstream-freebsd/lib/msun/src/s_lrintf.c",
"arm64/lrint.S",
"-upstream-freebsd/lib/msun/src/s_rint.c",
"-upstream-freebsd/lib/msun/src/s_rintf.c",
"arm64/rint.S",
"-upstream-freebsd/lib/msun/src/e_sqrt.c",
"-upstream-freebsd/lib/msun/src/e_sqrtf.c",
"arm64/sqrt.S",
"-upstream-freebsd/lib/msun/src/s_trunc.c",
"-upstream-freebsd/lib/msun/src/s_truncf.c",
"arm64/trunc.S",
],
exclude_srcs: [
"upstream-freebsd/lib/msun/src/s_ceil.c",
"upstream-freebsd/lib/msun/src/s_ceilf.c",
"upstream-freebsd/lib/msun/src/s_fma.c",
"upstream-freebsd/lib/msun/src/s_fmaf.c",
"upstream-freebsd/lib/msun/src/s_floor.c",
"upstream-freebsd/lib/msun/src/s_floorf.c",
"upstream-freebsd/lib/msun/src/s_llrint.c",
"upstream-freebsd/lib/msun/src/s_llrintf.c",
"upstream-freebsd/lib/msun/src/s_lrint.c",
"upstream-freebsd/lib/msun/src/s_lrintf.c",
"upstream-freebsd/lib/msun/src/s_rint.c",
"upstream-freebsd/lib/msun/src/s_rintf.c",
"upstream-freebsd/lib/msun/src/e_sqrt.c",
"upstream-freebsd/lib/msun/src/e_sqrtf.c",
"upstream-freebsd/lib/msun/src/s_trunc.c",
"upstream-freebsd/lib/msun/src/s_truncf.c",
],
},
mips: {