Fix some easy cases of __ANDROID__ versus __BIONIC__.
We need to make a clearer distinction for bionic on the host. This patch
doesn't fully address things like "should host bionic try to talk to netd?"
for now, but is a step in the right direction.
Bug: http://b/31559095
Test: bionic tests.
Change-Id: I49812f8b75d9d78c4fd8a8ddf5df1201d63771d6
diff --git a/libc/dns/net/getaddrinfo.c b/libc/dns/net/getaddrinfo.c
index cc8b8b4..13000f7 100644
--- a/libc/dns/net/getaddrinfo.c
+++ b/libc/dns/net/getaddrinfo.c
@@ -108,9 +108,9 @@
#include <stdarg.h>
#include "nsswitch.h"
-#ifdef ANDROID_CHANGES
+#if defined(__BIONIC__)
#include <sys/system_properties.h>
-#endif /* ANDROID_CHANGES */
+#endif
typedef union sockaddr_union {
struct sockaddr generic;
@@ -325,7 +325,7 @@
{
struct addrinfo *next;
-#if __ANDROID__
+#if defined(__BIONIC__)
if (ai == NULL) return;
#else
_DIAGASSERT(ai != NULL);