commit 9b828adfad09200f3f1bd3602187fe3dd5335774
author Elliott Hughes <enh@google.com> Thu Jul 30 08:47:35 2015 -0700
committer Elliott Hughes <enh@google.com> Thu Jul 30 09:33:43 2015 -0700
tree dbea9a10676206346b39e428e74ee630a1a71219
parent dcf890914c7571d3068046b9df1f672e9f45b4d2

Use __ANDROID__ instead of HAVE_ANDROID_OS.

Change-Id: I9967f3fd758c2a5b40be5b60ae72be7e2fb75136

libcutils/sockets.c

diff --git a/libcutils/sockets.c b/libcutils/sockets.c
index 15ede2b..d438782 100644
--- a/libcutils/sockets.c
+++ b/libcutils/sockets.c
@@ -17,7 +17,7 @@
 #include <cutils/sockets.h>
 #include <log/log.h>
 
-#ifdef HAVE_ANDROID_OS
+#if defined(__ANDROID__)
 /* For the socket trust (credentials) check */
 #include <private/android_filesystem_config.h>
 #define __android_unused
@@ -27,7 +27,7 @@
 
 bool socket_peer_is_trusted(int fd __android_unused)
 {
-#ifdef HAVE_ANDROID_OS
+#if defined(__ANDROID__)
     struct ucred cr;
     socklen_t len = sizeof(cr);
     int n = getsockopt(fd, SOL_SOCKET, SO_PEERCRED, &cr, &len);