commit 506c6deff726c8c052ff5abb0cef57e63707bd1c
author Elliott Hughes <enh@google.com> Fri Jan 15 16:30:18 2016 -0800
committer Elliott Hughes <enh@google.com> Fri Jan 15 16:30:18 2016 -0800
tree 42a751602c065bdb8c76ef53dffaca585934614a
parent 299798fe02cd43c21e62352f11d7be30d85e0f96

Sync with upstream OpenBSD.

Also some minor build cleanup.

Change-Id: Ibd20602d7ea45685f0c47fceb00ffd6c7ae35954

libc/Android.mk

diff --git a/libc/Android.mk b/libc/Android.mk
index 39c8c9e..bf4be8c 100644
--- a/libc/Android.mk
+++ b/libc/Android.mk
@@ -440,6 +440,7 @@
     upstream-openbsd/lib/libc/net/inet_pton.c \
     upstream-openbsd/lib/libc/net/ntohl.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/clrerr.c \
     upstream-openbsd/lib/libc/stdio/dprintf.c \
@@ -797,12 +798,6 @@
     upstream-netbsd/lib/libc/isc/ev_timers.c \
     upstream-netbsd/lib/libc/resolv/mtctxres.c \
 
-# We use the OpenBSD res_random.
-LOCAL_CFLAGS += \
-    -Dres_randomid=__res_randomid
-LOCAL_SRC_FILES += \
-    upstream-openbsd/lib/libc/net/res_random.c \
-
 LOCAL_CFLAGS += \
     $(libc_common_cflags) \
     -DANDROID_CHANGES \