commit da44d773dedf8aae6153e3423012f236cba3bfcd
author Mathieu Chartier <mathieuc@google.com> Tue Apr 01 15:01:46 2014 -0700
committer Mathieu Chartier <mathieuc@google.com> Tue Apr 01 15:17:31 2014 -0700
tree 60c9e81292f2c62af9764d53e8b4077f24879f7b
parent e0309ad355e778fe692beb8968bf8aa7edbd3302

Fix running with DlMalloc instead of RosAlloc.

Bug: 13748830
Bug: 13744490

Change-Id: Ieec97cf58ebf9864a40ee85aae582cdcf3f27c0c

runtime/gc/heap.cc

diff --git a/runtime/gc/heap.cc b/runtime/gc/heap.cc
index 1a32a9a..1bfe9bf 100644
--- a/runtime/gc/heap.cc
+++ b/runtime/gc/heap.cc
@@ -21,7 +21,6 @@
 
 #include <limits>
 #include <vector>
-#include <valgrind.h>
 
 #include "base/histogram-inl.h"
 #include "base/stl_util.h"
@@ -150,7 +149,7 @@
       total_allocation_time_(0),
       verify_object_mode_(kVerifyObjectModeDisabled),
       disable_moving_gc_count_(0),
-      running_on_valgrind_(RUNNING_ON_VALGRIND > 0),
+      running_on_valgrind_(Runtime::Current()->RunningOnValgrind()),
       use_tlab_(use_tlab) {
   if (VLOG_IS_ON(heap) || VLOG_IS_ON(startup)) {
     LOG(INFO) << "Heap() entering";