commit 68875719e13cababb7ec737de256f79dfd1eb806
author Elliott Hughes <enh@google.com> Fri Jul 31 08:51:17 2015 -0700
committer Elliott Hughes <enh@google.com> Fri Jul 31 08:51:17 2015 -0700
tree 98e65742680e435de6c3204ca40564d8325ae130
parent f85e32ec57a23664d9cdff8338903aaae2cf73e3

Use __ANDROID__ instead of HAVE_ANDROID_OS.

Change-Id: Iac5ef595dffe890ad06917afe20085b5628ec267

JniInvocation.cpp

diff --git a/JniInvocation.cpp b/JniInvocation.cpp
index 30b1205..4559b43 100644
--- a/JniInvocation.cpp
+++ b/JniInvocation.cpp
@@ -25,7 +25,7 @@
 #define LOG_TAG "JniInvocation"
 #include "cutils/log.h"
 
-#ifdef HAVE_ANDROID_OS
+#ifdef __ANDROID__
 #include "cutils/properties.h"
 #endif
 
@@ -48,7 +48,7 @@
   }
 }
 
-#ifdef HAVE_ANDROID_OS
+#ifdef __ANDROID__
 static const char* kLibrarySystemProperty = "persist.sys.dalvik.vm.lib.2";
 static const char* kDebuggableSystemProperty = "ro.debuggable";
 static const char* kDebuggableFallback = "0";  // Not debuggable.
@@ -58,7 +58,7 @@
 template<typename T> void UNUSED(const T&) {}
 
 const char* JniInvocation::GetLibrary(const char* library, char* buffer) {
-#ifdef HAVE_ANDROID_OS
+#ifdef __ANDROID__
   const char* default_library;
 
   char debuggable[PROPERTY_VALUE_MAX];
@@ -95,7 +95,7 @@
 }
 
 bool JniInvocation::Init(const char* library) {
-#ifdef HAVE_ANDROID_OS
+#ifdef __ANDROID__
   char buffer[PROPERTY_VALUE_MAX];
 #else
   char* buffer = NULL;