Align Soong builds closer to Make
This moves the Android.bp file to use wildcards in the same places that
they're using in the Android.mk file. It also fixes a file that was in a
different order.
Make and Soong still produce binaries with object files in different
orders, but that's due to Make reordering the object files based on
compile type. Soong keeps the original specified order. It's not
possible to emulate the reordered files in the Android.bp, since the
arch-specific files won't interleave properly.
Change-Id: I9052b3ed7c523c13df5cbe606f913c32c88c7c5f
diff --git a/libc/Android.bp b/libc/Android.bp
index ae883d2..35453c5 100644
--- a/libc/Android.bp
+++ b/libc/Android.bp
@@ -193,11 +193,7 @@
defaults: ["libc_defaults"],
srcs: [
- "tzcode/asctime.c",
- "tzcode/difftime.c",
- "tzcode/localtime.c",
- "tzcode/strftime.c",
- "tzcode/strptime.c",
+ "tzcode/**/*.c",
"upstream-openbsd/lib/libc/time/wcsftime.c", // tzcode doesn't include wcsftime, so we use the OpenBSD one.
],
@@ -235,31 +231,7 @@
defaults: ["libc_defaults"],
srcs: [
- "dns/net/gethnamaddr.c",
- "dns/net/getservbyname.c",
- "dns/net/getservbyport.c",
- "dns/net/getaddrinfo.c",
- "dns/net/getnameinfo.c",
- "dns/net/sethostent.c",
- "dns/net/getservent.c",
- "dns/net/nsdispatch.c",
- "dns/net/base64.c",
- "dns/resolv/res_state.c",
- "dns/resolv/res_init.c",
- "dns/resolv/res_mkquery.c",
- "dns/resolv/res_data.c",
- "dns/resolv/res_debug.c",
- "dns/resolv/herror.c",
- "dns/resolv/res_cache.c",
- "dns/resolv/res_query.c",
- "dns/resolv/res_comp.c",
- "dns/resolv/res_send.c",
- "dns/nameser/ns_name.c",
- "dns/nameser/ns_print.c",
- "dns/nameser/ns_parse.c",
- "dns/nameser/ns_ttl.c",
- "dns/nameser/ns_netint.c",
- "dns/nameser/ns_samedomain.c",
+ "dns/**/*.c",
"upstream-netbsd/lib/libc/isc/ev_streams.c",
"upstream-netbsd/lib/libc/isc/ev_timers.c",
@@ -326,8 +298,8 @@
"upstream-freebsd/lib/libc/string/wcstok.c",
"upstream-freebsd/lib/libc/string/wmemchr.c",
"upstream-freebsd/lib/libc/string/wmemcmp.c",
- "upstream-freebsd/lib/libc/string/wmemset.c",
"upstream-freebsd/lib/libc/string/wmemmove.c",
+ "upstream-freebsd/lib/libc/string/wmemset.c",
],
arch: {
arm64: {