From 56bf0c793d461cc2f9c37ab8fce79a268fd700e0 Mon Sep 17 00:00:00 2001
From: Dmitriy Ivanov <dimitry@google.com>
Date: Wed, 26 Nov 2014 10:30:11 -0800
Subject: [PATCH] Disable stack mprotects when running on valgrind

Bug: 18155388
Change-Id: I17d7e3c707e83b864b0394ebbfb2438021faf76f
---
 runtime/runtime.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/runtime/runtime.cc b/runtime/runtime.cc
index bcfb2fe3a..d6cafcc6d 100644
--- a/runtime/runtime.cc
+++ b/runtime/runtime.cc
@@ -760,7 +760,7 @@ bool Runtime::Init(const RuntimeOptions& raw_options, bool ignore_unrecognized)
     case kArm64:
     case kX86_64:
       implicit_null_checks_ = true;
-      implicit_so_checks_ = true;
+      implicit_so_checks_ = (RUNNING_ON_VALGRIND == 0);
       break;
     default:
       // Keep the defaults.
-- 
2.11.0