summaryrefslogtreecommitdiffstats
path: root/runtime/runtime.cc
diff options
context:
space:
mode:
authorMathieu Chartier <mathieuc@google.com>2014-04-01 15:01:46 -0700
committerMathieu Chartier <mathieuc@google.com>2014-04-01 15:17:31 -0700
commitda44d773dedf8aae6153e3423012f236cba3bfcd (patch)
tree60c9e81292f2c62af9764d53e8b4077f24879f7b /runtime/runtime.cc
parente0309ad355e778fe692beb8968bf8aa7edbd3302 (diff)
downloadart-da44d773dedf8aae6153e3423012f236cba3bfcd.zip
art-da44d773dedf8aae6153e3423012f236cba3bfcd.tar.gz
art-da44d773dedf8aae6153e3423012f236cba3bfcd.tar.bz2
Fix running with DlMalloc instead of RosAlloc.
Bug: 13748830 Bug: 13744490 Change-Id: Ieec97cf58ebf9864a40ee85aae582cdcf3f27c0c
Diffstat (limited to 'runtime/runtime.cc')
-rw-r--r--runtime/runtime.cc2
1 files changed, 2 insertions, 0 deletions
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 @@ Runtime::Runtime()
exit_(nullptr),
abort_(nullptr),
stats_enabled_(false),
+ running_on_valgrind_(RUNNING_ON_VALGRIND > 0),
profile_(false),
profile_period_s_(0),
profile_duration_s_(0),