Merge pull request #334 from chinmaygarde/master

chinmaygarde · chinmaygarde · commit 6a3fe825e679 · 2015-07-28T14:46:42.000-07:00
Avoid mprotect calls on iOS
diff --git a/build/config/BUILD.gn b/build/config/BUILD.gn
@@ -136,7 +136,7 @@ config("feature_flags") {
   if (use_allocator != "tcmalloc") {
     defines += [ "NO_TCMALLOC" ]
   }
-  if (is_asan || is_lsan || is_tsan || is_msan) {
+  if (is_asan || is_lsan || is_tsan || is_msan || is_ios) {
     defines += [
       "MEMORY_TOOL_REPLACES_ALLOCATOR",
       "MEMORY_SANITIZER_INITIAL_SIZE",

Original file line number	Diff line number	Diff line change
`@@ -136,7 +136,7 @@ config("feature_flags") {`
`136`	`136`	`if (use_allocator != "tcmalloc") {`
`137`	`137`	`defines += [ "NO_TCMALLOC" ]`
`138`	`138`	`}`
`139`		`- if (is_asan \|\| is_lsan \|\| is_tsan \|\| is_msan) {`
	`139`	`+ if (is_asan \|\| is_lsan \|\| is_tsan \|\| is_msan \|\| is_ios) {`
`140`	`140`	`defines += [`
`141`	`141`	`"MEMORY_TOOL_REPLACES_ALLOCATOR",`
`142`	`142`	`"MEMORY_SANITIZER_INITIAL_SIZE",`