am 4a46a689: Merge "Moved private dns header to their own dir."

* commit '4a46a68942d180e28c3e87f08359351245b220b7': Moved private dns header to their own dir.
2014-03-04 17:19:13 +00:00 · 2014-03-04 17:19:13 +00:00 · cc0948d86a
commit cc0948d86a
parent 8121d264bc 4a46a68942
6 changed files with 1 additions and 0 deletions
--- a/libc/Android.mk
+++ b/libc/Android.mk
@ -512,6 +512,7 @@ LOCAL_SRC_FILES := $(call all-c-files-under,dns)
 LOCAL_CFLAGS := \
    $(libc_common_cflags) \
    -DINET6 \
+    -I$(LOCAL_PATH)/dns/include \
    -I$(LOCAL_PATH)/private \
    -I$(LOCAL_PATH)/upstream-netbsd/lib/libc/include # for NetBSD private headers
 LOCAL_CONLYFLAGS := $(libc_common_conlyflags)
--- a/libc/dns/include/nsswitch.h
+++ b/libc/dns/include/nsswitch.h
--- a/libc/dns/include/resolv_cache.h
+++ b/libc/dns/include/resolv_cache.h
--- a/libc/dns/include/resolv_iface.h
+++ b/libc/dns/include/resolv_iface.h
--- a/libc/dns/include/resolv_private.h
+++ b/libc/dns/include/resolv_private.h
--- a/libc/dns/include/resolv_static.h
+++ b/libc/dns/include/resolv_static.h