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

libnativebridge/native_bridge.cc

diff --git a/libnativebridge/native_bridge.cc b/libnativebridge/native_bridge.cc
index a9671a9..32a65ea 100644
--- a/libnativebridge/native_bridge.cc
+++ b/libnativebridge/native_bridge.cc
@@ -295,13 +295,13 @@
   // so we save the extra file existence check.
   char cpuinfo_path[1024];
 
-#ifdef HAVE_ANDROID_OS
+#if defined(__ANDROID__)
   snprintf(cpuinfo_path, sizeof(cpuinfo_path), "/system/lib"
 #ifdef __LP64__
       "64"
 #endif  // __LP64__
       "/%s/cpuinfo", instruction_set);
-#else   // !HAVE_ANDROID_OS
+#else   // !__ANDROID__
   // To be able to test on the host, we hardwire a relative path.
   snprintf(cpuinfo_path, sizeof(cpuinfo_path), "./cpuinfo");
 #endif