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/runtime.cc

diff --git a/runtime/runtime.cc b/runtime/runtime.cc
index f016189..bafc0fc 100644
--- a/runtime/runtime.cc
+++ b/runtime/runtime.cc
@@ -22,6 +22,7 @@
 
 #include <signal.h>
 #include <sys/syscall.h>
+#include <valgrind.h>
 
 #include <cstdio>
 #include <cstdlib>
@@ -111,6 +112,7 @@
       exit_(nullptr),
       abort_(nullptr),
       stats_enabled_(false),
+      running_on_valgrind_(RUNNING_ON_VALGRIND > 0),
       profile_(false),
       profile_period_s_(0),
       profile_duration_s_(0),