commit fcb502e3ec032497bba7f8634fb214e0c05394d8
author Calin Juravle <calin@google.com> Wed Mar 05 15:06:52 2014 +0000
committer Calin Juravle <calin@google.com> Thu Mar 06 18:36:43 2014 +0000
tree a8c36425833248efd74f1b85fc1e4c9208d3285f
parent 569fb9887d00104509df79fa77d92e3cf9afe7db

Sync up nameser with upstream(2014.03.05)

Bug: 13219633

Change-Id: I8ee4ddf270710e9eea415fa3db984af7719a8dd4

libc/Android.mk

diff --git a/libc/Android.mk b/libc/Android.mk
index 2046bea..d2b67c1 100644
--- a/libc/Android.mk
+++ b/libc/Android.mk
@@ -514,7 +514,8 @@
     -DINET6 \
     -I$(LOCAL_PATH)/dns/include \
     -I$(LOCAL_PATH)/private \
-    -I$(LOCAL_PATH)/upstream-netbsd/lib/libc/include # for NetBSD private headers
+    -I$(LOCAL_PATH)/upstream-netbsd/lib/libc/include \
+    -include upstream-netbsd/netbsd-compat.h
 LOCAL_CONLYFLAGS := $(libc_common_conlyflags)
 LOCAL_CPPFLAGS := $(libc_common_cppflags)
 LOCAL_C_INCLUDES := $(libc_common_c_includes)