Merge "Update Android.bp to match Android.mk"

This commit is contained in:
Colin Cross 2016-01-20 19:58:16 +00:00 committed by Gerrit Code Review
commit 18dea9b8d4
1 changed files with 3 additions and 5 deletions

View File

@ -6,8 +6,6 @@ libc_common_src_files = [
"bionic/ether_ntoa.c", "bionic/ether_ntoa.c",
"bionic/fts.c", "bionic/fts.c",
"bionic/getpriority.c", "bionic/getpriority.c",
"bionic/if_indextoname.c",
"bionic/if_nametoindex.c",
"bionic/initgroups.c", "bionic/initgroups.c",
"bionic/isatty.c", "bionic/isatty.c",
"bionic/memmem.c", "bionic/memmem.c",
@ -236,12 +234,9 @@ cc_library_static {
"upstream-netbsd/lib/libc/isc/ev_streams.c", "upstream-netbsd/lib/libc/isc/ev_streams.c",
"upstream-netbsd/lib/libc/isc/ev_timers.c", "upstream-netbsd/lib/libc/isc/ev_timers.c",
"upstream-netbsd/lib/libc/resolv/mtctxres.c", "upstream-netbsd/lib/libc/resolv/mtctxres.c",
// We use the OpenBSD res_random.
"upstream-openbsd/lib/libc/net/res_random.c",
], ],
cflags: [ cflags: [
"-Dres_randomid=__res_randomid",
"-DANDROID_CHANGES", "-DANDROID_CHANGES",
"-DINET6", "-DINET6",
"-fvisibility=hidden", "-fvisibility=hidden",
@ -474,6 +469,7 @@ cc_library_static {
"upstream-openbsd/lib/libc/net/inet_pton.c", "upstream-openbsd/lib/libc/net/inet_pton.c",
"upstream-openbsd/lib/libc/net/ntohl.c", "upstream-openbsd/lib/libc/net/ntohl.c",
"upstream-openbsd/lib/libc/net/ntohs.c", "upstream-openbsd/lib/libc/net/ntohs.c",
"upstream-openbsd/lib/libc/net/res_random.c",
"upstream-openbsd/lib/libc/stdio/asprintf.c", "upstream-openbsd/lib/libc/stdio/asprintf.c",
"upstream-openbsd/lib/libc/stdio/clrerr.c", "upstream-openbsd/lib/libc/stdio/clrerr.c",
"upstream-openbsd/lib/libc/stdio/dprintf.c", "upstream-openbsd/lib/libc/stdio/dprintf.c",
@ -1308,6 +1304,7 @@ cc_library_static {
"bionic/arpa_inet.cpp", "bionic/arpa_inet.cpp",
"bionic/assert.cpp", "bionic/assert.cpp",
"bionic/atof.cpp", "bionic/atof.cpp",
"bionic/bionic_netlink.cpp",
"bionic/bionic_systrace.cpp", "bionic/bionic_systrace.cpp",
"bionic/bionic_time_conversions.cpp", "bionic/bionic_time_conversions.cpp",
"bionic/brk.cpp", "bionic/brk.cpp",
@ -1374,6 +1371,7 @@ cc_library_static {
"bionic/mntent.cpp", "bionic/mntent.cpp",
"bionic/mremap.cpp", "bionic/mremap.cpp",
"bionic/NetdClientDispatch.cpp", "bionic/NetdClientDispatch.cpp",
"bionic/net_if.cpp",
"bionic/open.cpp", "bionic/open.cpp",
"bionic/pathconf.cpp", "bionic/pathconf.cpp",
"bionic/pause.cpp", "bionic/pause.cpp",