commit e5e18cca3eefccf3a6aabd254ceb2c59f120a7d2
author Elliott Hughes <enh@google.com> Wed Aug 12 16:37:22 2015 -0700
committer Elliott Hughes <enh@google.com> Wed Aug 12 16:37:22 2015 -0700
tree e1cff4c67e49c654553edb499864cdd3a48776e8
parent 2b4632b580c756af046ee4b9a6ecc77a01388d4e

Lose HAVE_ANDROID_OS in frameworks/rs.

Change-Id: Iba57869192ba9b1fde995ff0e48b7a28b2cb122f

cpp/RenderScript.cpp

diff --git a/cpp/RenderScript.cpp b/cpp/RenderScript.cpp
index 3d81d62..66a7421 100644
--- a/cpp/RenderScript.cpp
+++ b/cpp/RenderScript.cpp
@@ -25,7 +25,7 @@
 #include <dlfcn.h>
 #include <unistd.h>
 
-#if !defined(RS_SERVER) && !defined(RS_COMPATIBILITY_LIB) && defined(HAVE_ANDROID_OS)
+#if !defined(RS_SERVER) && !defined(RS_COMPATIBILITY_LIB) && defined(__ANDROID__)
 #include <cutils/properties.h>
 #else
 #include "rsCompatibilityLib.h"
@@ -96,7 +96,7 @@
 }
 
 static uint32_t getProp(const char *str) {
-#if !defined(__LP64__) && !defined(RS_SERVER) && defined(HAVE_ANDROID_OS)
+#if !defined(__LP64__) && !defined(RS_SERVER) && defined(__ANDROID__)
     char buf[256];
     property_get(str, buf, "0");
     return atoi(buf);

rsContext.cpp

diff --git a/rsContext.cpp b/rsContext.cpp
index e018eb0..9048fbf 100644
--- a/rsContext.cpp
+++ b/rsContext.cpp
@@ -37,7 +37,7 @@
 #include <unistd.h>
 
 #if !defined(RS_SERVER) && !defined(RS_COMPATIBILITY_LIB) && \
-        defined(HAVE_ANDROID_OS)
+        defined(__ANDROID__)
 #include <cutils/properties.h>
 #endif
 
@@ -215,7 +215,7 @@
 #endif
 
 static uint32_t getProp(const char *str) {
-#if !defined(RS_SERVER) && defined(HAVE_ANDROID_OS)
+#if !defined(RS_SERVER) && defined(__ANDROID__)
     char buf[PROPERTY_VALUE_MAX];
     property_get(str, buf, "0");
     return atoi(buf);

rsDriverLoader.cpp

diff --git a/rsDriverLoader.cpp b/rsDriverLoader.cpp
index 125a6df..22868e5 100644
--- a/rsDriverLoader.cpp
+++ b/rsDriverLoader.cpp
@@ -37,7 +37,7 @@
 #include <unistd.h>
 
 #if !defined(RS_SERVER) && !defined(RS_COMPATIBILITY_LIB) && \
-        defined(HAVE_ANDROID_OS)
+        defined(__ANDROID__)
 #include <cutils/properties.h>
 #endif
 

rsFont.cpp

diff --git a/rsFont.cpp b/rsFont.cpp
index 8b38fde..0b557f2 100644
--- a/rsFont.cpp
+++ b/rsFont.cpp
@@ -20,7 +20,7 @@
 #include "rsFont.h"
 #include "rsProgramFragment.h"
 #include "rsMesh.h"
-#ifdef HAVE_ANDROID_OS
+#ifdef __ANDROID__
 #include <cutils/properties.h>
 #endif
 
@@ -343,7 +343,7 @@
     int32_t blackThreshold = DEFAULT_TEXT_BLACK_GAMMA_THRESHOLD;
     int32_t whiteThreshold = DEFAULT_TEXT_WHITE_GAMMA_THRESHOLD;
 
-#ifdef HAVE_ANDROID_OS
+#ifdef __ANDROID__
     // Get the renderer properties
     char property[PROPERTY_VALUE_MAX];