From 09d90e4e70819607b76bdd2bd4f23be3922b9050 Mon Sep 17 00:00:00 2001
From: jochen <jochen@chromium.org>
Date: Thu, 2 Jun 2016 02:54:54 -0700
Subject: [PATCH] Reland "Move (hopefully) remaining isolate related variables
 to toolchain.gypi"

BUG=chromium:609107
R=machenbach@chromium.org

Review-Url: https://codereview.chromium.org/2032733003
Cr-Commit-Position: refs/heads/master@{#36677}
---
 gypfiles/standalone.gypi | 4 ----
 gypfiles/toolchain.gypi  | 2 ++
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/gypfiles/standalone.gypi b/gypfiles/standalone.gypi
index 14533a844f..3191641310 100644
--- a/gypfiles/standalone.gypi
+++ b/gypfiles/standalone.gypi
@@ -112,9 +112,6 @@
       'use_goma%': 0,
       'gomadir%': '',
 
-      # Check if valgrind directories are present.
-      'has_valgrind%': 0,
-
       'test_isolation_mode%': 'noop',
 
       'conditions': [
@@ -164,7 +161,6 @@
     'test_isolation_mode%': '<(test_isolation_mode)',
     'fastbuild%': '<(fastbuild)',
     'coverage%': '<(coverage)',
-    'has_valgrind%': '<(has_valgrind)',
 
     # Add a simple extras solely for the purpose of the cctests
     'v8_extra_library_files': ['../test/cctest/test-extra.js'],
diff --git a/gypfiles/toolchain.gypi b/gypfiles/toolchain.gypi
index f5f0289917..5cda378505 100644
--- a/gypfiles/toolchain.gypi
+++ b/gypfiles/toolchain.gypi
@@ -37,6 +37,8 @@
     'tsan%': 0,
     'ubsan%': 0,
     'ubsan_vptr%': 0,
+    'has_valgrind%': 0,
+    'coverage%': 0,
     'v8_target_arch%': '<(target_arch)',
     'v8_host_byteorder%': '<!(python -c "import sys; print sys.byteorder")',
     # Native Client builds currently use the V8 ARM JIT and