summaryrefslogtreecommitdiffstats
path: root/runtime/runtime.cc
diff options
context:
space:
mode:
authorMathieu Chartier <mathieuc@google.com>2014-04-01 22:37:45 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2014-04-01 22:37:45 +0000
commit252f848f68356551980701126481e0685bbded08 (patch)
tree2aeec7b68eff57bb84218d70aa47ba936cf43171 /runtime/runtime.cc
parentb3d7eed9f760fa22e3a8e87ec2c8ff3fe50a1f50 (diff)
parentda44d773dedf8aae6153e3423012f236cba3bfcd (diff)
downloadart-252f848f68356551980701126481e0685bbded08.zip
art-252f848f68356551980701126481e0685bbded08.tar.gz
art-252f848f68356551980701126481e0685bbded08.tar.bz2
Merge "Fix running with DlMalloc instead of RosAlloc."
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 3e3b5e4..c0bb36a 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>
@@ -112,6 +113,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),