Use __ANDROID__ instead of HAVE_ANDROID_OS.
Change-Id: Iac5ef595dffe890ad06917afe20085b5628ec267
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;
diff --git a/tests/JniInvocation_test.cpp b/tests/JniInvocation_test.cpp
index b1d2b68..186b74e 100644
--- a/tests/JniInvocation_test.cpp
+++ b/tests/JniInvocation_test.cpp
@@ -22,7 +22,7 @@
#include "string.h"
-#if defined(HAVE_ANDROID_OS) && defined(__BIONIC__)
+#if defined(__ANDROID__) && defined(__BIONIC__)
#define HAVE_TEST_STUFF 1
#else
#undef HAVE_TEST_STUFF