commit c60e1b755c5632dfeb04c333489ede52ee5c945f
author Andreas Gampe <agampe@google.com> Thu Jul 30 08:57:50 2015 -0700
committer Andreas Gampe <agampe@google.com> Thu Jul 30 08:57:50 2015 -0700
tree 9582a0ffc99e4ad11dcd5d95dd97b09bc6acc5bf
parent 7b926cdacc2b67241bc9cb5f2d4b04b13ca79d0e

ART: Use __ANDROID__ instead of HAVE_ANDROID_OS

Use the proper define.

Change-Id: I71e291ac25f5d5f0187ac9b6ef2d6872f19e6085

compiler/jni/jni_cfi_test.cc

diff --git a/compiler/jni/jni_cfi_test.cc b/compiler/jni/jni_cfi_test.cc
index 016f28e..0bfe8a2 100644
--- a/compiler/jni/jni_cfi_test.cc
+++ b/compiler/jni/jni_cfi_test.cc
@@ -28,7 +28,7 @@
 namespace art {
 
 // Run the tests only on host.
-#ifndef HAVE_ANDROID_OS
+#ifndef __ANDROID__
 
 class JNICFITest : public CFITest {
  public:
@@ -88,6 +88,6 @@
 TEST_ISA(kMips)
 TEST_ISA(kMips64)
 
-#endif  // HAVE_ANDROID_OS
+#endif  // __ANDROID__
 
 }  // namespace art