Merge "Renamed the misleading libc/netbsd directory to libc/dns."
authorCalin Juravle <calin@google.com>
Tue, 4 Mar 2014 14:25:30 +0000 (14:25 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Tue, 4 Mar 2014 14:25:30 +0000 (14:25 +0000)
35 files changed:
HACKING.txt
libc/Android.mk
libc/dns/gethnamaddr.c [moved from libc/netbsd/gethnamaddr.c with 100% similarity]
libc/dns/inet/nsap_addr.c [moved from libc/netbsd/inet/nsap_addr.c with 100% similarity]
libc/dns/nameser/ns_name.c [moved from libc/netbsd/nameser/ns_name.c with 100% similarity]
libc/dns/nameser/ns_netint.c [moved from libc/netbsd/nameser/ns_netint.c with 100% similarity]
libc/dns/nameser/ns_parse.c [moved from libc/netbsd/nameser/ns_parse.c with 100% similarity]
libc/dns/nameser/ns_print.c [moved from libc/netbsd/nameser/ns_print.c with 100% similarity]
libc/dns/nameser/ns_samedomain.c [moved from libc/netbsd/nameser/ns_samedomain.c with 100% similarity]
libc/dns/nameser/ns_ttl.c [moved from libc/netbsd/nameser/ns_ttl.c with 100% similarity]
libc/dns/net/base64.c [moved from libc/netbsd/net/base64.c with 100% similarity]
libc/dns/net/getaddrinfo.c [moved from libc/netbsd/net/getaddrinfo.c with 100% similarity]
libc/dns/net/getnameinfo.c [moved from libc/netbsd/net/getnameinfo.c with 100% similarity]
libc/dns/net/getservbyname.c [moved from libc/netbsd/net/getservbyname.c with 100% similarity]
libc/dns/net/getservbyport.c [moved from libc/netbsd/net/getservbyport.c with 100% similarity]
libc/dns/net/getservent.c [moved from libc/netbsd/net/getservent.c with 100% similarity]
libc/dns/net/nsdispatch.c [moved from libc/netbsd/net/nsdispatch.c with 100% similarity]
libc/dns/net/reentrant.h [moved from libc/netbsd/net/reentrant.h with 100% similarity]
libc/dns/net/servent.h [moved from libc/netbsd/net/servent.h with 100% similarity]
libc/dns/net/services.h [moved from libc/netbsd/net/services.h with 100% similarity]
libc/dns/resolv/__dn_comp.c [moved from libc/netbsd/resolv/__dn_comp.c with 100% similarity]
libc/dns/resolv/__res_close.c [moved from libc/netbsd/resolv/__res_close.c with 100% similarity]
libc/dns/resolv/__res_send.c [moved from libc/netbsd/resolv/__res_send.c with 100% similarity]
libc/dns/resolv/herror.c [moved from libc/netbsd/resolv/herror.c with 100% similarity]
libc/dns/resolv/res_cache.c [moved from libc/netbsd/resolv/res_cache.c with 100% similarity]
libc/dns/resolv/res_comp.c [moved from libc/netbsd/resolv/res_comp.c with 100% similarity]
libc/dns/resolv/res_data.c [moved from libc/netbsd/resolv/res_data.c with 100% similarity]
libc/dns/resolv/res_debug.c [moved from libc/netbsd/resolv/res_debug.c with 100% similarity]
libc/dns/resolv/res_debug.h [moved from libc/netbsd/resolv/res_debug.h with 100% similarity]
libc/dns/resolv/res_init.c [moved from libc/netbsd/resolv/res_init.c with 100% similarity]
libc/dns/resolv/res_mkquery.c [moved from libc/netbsd/resolv/res_mkquery.c with 100% similarity]
libc/dns/resolv/res_private.h [moved from libc/netbsd/resolv/res_private.h with 100% similarity]
libc/dns/resolv/res_query.c [moved from libc/netbsd/resolv/res_query.c with 100% similarity]
libc/dns/resolv/res_send.c [moved from libc/netbsd/resolv/res_send.c with 100% similarity]
libc/dns/resolv/res_state.c [moved from libc/netbsd/resolv/res_state.c with 100% similarity]

index 6c142e13f0d548e081ce61de71e617311f5d46f4..9f45903a76ff565db843bb935d4b975e0034abe7 100644 (file)
@@ -81,7 +81,6 @@ libc/
   private/
     # These are private header files meant for use within bionic itself.
 
-  netbsd/
   stdio/
   stdlib/
   unistd/
@@ -89,9 +88,8 @@ libc/
     # mess of random versions of random files from all three of FreeBSD, NetBSD,
     # and OpenBSD! We've been working to clean that up, but these directories
     # are basically where all the stuff we haven't got to yet lives.
-    # The 'netbsd' directory misleadingly contains the DNS resolver (which will
-    # probably be forked sometime soon, and that directory simply renamed).
-    # The other directories contain stuff that still needs to be sorted.
+  dns/
+    # Contains the DNS resolver (originates from NetBSD code).
 
   upstream-dlmalloc/
   upstream-freebsd/
index ea020548bc49a5f587b59fefbb7d9511572ba281..25de501f549e1b9d6cfd147ed502bbef30830c8e 100644 (file)
@@ -508,7 +508,7 @@ include $(BUILD_STATIC_LIBRARY)
 
 include $(CLEAR_VARS)
 
-LOCAL_SRC_FILES := $(call all-c-files-under,netbsd)
+LOCAL_SRC_FILES := $(call all-c-files-under,dns)
 LOCAL_CFLAGS := \
     $(libc_common_cflags) \
     -DINET6 \