commit 3fd52b6723df4903c3f821bd9c2ca5538a516f6c
author Elliott Hughes <enh@google.com> Thu Jul 30 15:52:11 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jul 30 15:52:11 2015 +0000
tree c56d25f64d303523c605287fb1f7f755ff3caafc
parent ccca2a8f71dbef6d4a803118f306909c074ab489
parent 2664be0232a806b056e6654bf386f374b6d72969

Merge "Use __ANDROID__ instead of HAVE_ANDROID_OS."

luni/src/main/native/java_lang_System.cpp

diff --git a/luni/src/main/native/java_lang_System.cpp b/luni/src/main/native/java_lang_System.cpp
index 306adab..a552cfd 100644
--- a/luni/src/main/native/java_lang_System.cpp
+++ b/luni/src/main/native/java_lang_System.cpp
@@ -34,7 +34,7 @@
 #include <time.h>
 #include <unistd.h>
 
-#if defined(HAVE_ANDROID_OS)
+#if defined(__ANDROID__)
 extern "C" void android_get_LD_LIBRARY_PATH(char*, size_t);
 #endif
 
@@ -91,7 +91,7 @@
 #endif
 
     const char* library_path = getenv("LD_LIBRARY_PATH");
-#if defined(HAVE_ANDROID_OS)
+#if defined(__ANDROID__)
     if (library_path == NULL) {
         android_get_LD_LIBRARY_PATH(path, sizeof(path));
         library_path = path;