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

runtime/debugger.cc

diff --git a/runtime/debugger.cc b/runtime/debugger.cc
index f0de65b..c9ae9b8 100644
--- a/runtime/debugger.cc
+++ b/runtime/debugger.cc
@@ -4626,7 +4626,7 @@
   // Send a series of heap segment chunks.
   HeapChunkContext context(what == HPSG_WHAT_MERGED_OBJECTS, native);
   if (native) {
-#if defined(HAVE_ANDROID_OS) && defined(USE_DLMALLOC)
+#if defined(__ANDROID__) && defined(USE_DLMALLOC)
     dlmalloc_inspect_all(HeapChunkContext::HeapChunkNativeCallback, &context);
     HeapChunkContext::HeapChunkNativeCallback(nullptr, nullptr, 0, &context);  // Indicate end of a space.
 #else