Revert of Move (hopefully) remaining isolate related variables to toolchain.gypi

gypfiles/toolchain.gypi

 # Copyright 2013 the V8 project authors. All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 #       notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
 #       copyright notice, this list of conditions and the following
 #       disclaimer in the documentation and/or other materials provided
@@ skipping 11 matching lines @@
 # LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 # DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 # Shared definitions for all V8-related targets.
 
 {
   'variables': {
-    'variables': {
-      'variables': {
-        # Instrument for code coverage and use coverage wrapper to exclude some
-        # files. Uses gcov if clang=0 is set explicitly. Otherwise,
-        # sanitizer_coverage must be set too.
-        'coverage%': 0,
-      },
-
-      'coverage%': '<(coverage)',
-
-      # Check if valgrind directories are present.
-      'has_valgrind%': '<!pymod_do_main(has_valgrind)',
-    },
     'msvs_use_common_release': 0,
     'clang%': 0,
     'asan%': 0,
     'lsan%': 0,
     'msan%': 0,
     'tsan%': 0,
     'ubsan%': 0,
     'ubsan_vptr%': 0,
-    'has_valgrind%': '<(has_valgrind)',
-    'coverage%': '<(coverage)',
     '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
     # arm/simulator-arm.cc to defer the significant effort required
     # for NaCl JIT support. The nacl_target_arch variable provides
     # the 'true' target arch for places in this file that need it.
     # TODO(bradchen): get rid of nacl_target_arch when someday
     # NaCl V8 builds stop using the ARM simulator
     'nacl_target_arch%': 'none',     # must be set externally
 
@@ skipping 1338 matching lines @@
             ],
           },
           'Release_x64': {
             'inherit_from': ['ReleaseBase'],
           },
         }],
       ],
     },  # configurations
   },  # target_defaults
 }