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/process_name.c

diff --git a/libcutils/process_name.c b/libcutils/process_name.c
index cc931eb..5d28b6f 100644
--- a/libcutils/process_name.c
+++ b/libcutils/process_name.c
@@ -25,19 +25,19 @@
 #include <unistd.h>
 
 #include <cutils/process_name.h>
-#ifdef HAVE_ANDROID_OS
+#if defined(__ANDROID__)
 #include <cutils/properties.h>
 #endif
 
 #define PROCESS_NAME_DEVICE "/sys/qemu_trace/process_name"
 
 static const char* process_name = "unknown";
-#ifdef HAVE_ANDROID_OS
+#if defined(__ANDROID__)
 static int running_in_emulator = -1;
 #endif
 
 void set_process_name(const char* new_name) {
-#ifdef HAVE_ANDROID_OS
+#if defined(__ANDROID__)
     char  propBuf[PROPERTY_VALUE_MAX];
 #endif
 
@@ -59,7 +59,7 @@
     }
 #endif
 
-#ifdef HAVE_ANDROID_OS
+#if defined(__ANDROID__)
     // If we know we are not running in the emulator, then return.
     if (running_in_emulator == 0) {
         return;