Revert of [coverage] Filter some files from instrumentation.

build/standalone.gypi

 # Copyright 2012 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 30 matching lines @@
     'visibility%': 'hidden',
     'v8_enable_backtrace%': 0,
     'v8_enable_i18n_support%': 1,
     'v8_deprecation_warnings': 1,
     'v8_imminent_deprecation_warnings': 1,
     'msvs_multi_core_compile%': '1',
     'mac_deployment_target%': '10.5',
     'release_extra_cflags%': '',
     'variables': {
       'variables': {
-        # goma settings.
-        # 1 to use goma.
-        # If no gomadir is set, it uses the default gomadir.
-        'use_goma%': 0,
-        'gomadir%': '',
-
         'variables': {
           'conditions': [
             ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or \
                OS=="netbsd" or OS=="mac" or OS=="qnx" or OS=="aix"', {
               # This handles the Unix platforms we generally deal with.
               # Anything else gets passed through, which probably won't work
               # very well; such hosts should pass an explicit target_arch
               # to gyp.
               'host_arch%': '<!pymod_do_main(detect_v8_host_arch)',
             }, {
               # OS!="linux" and OS!="freebsd" and OS!="openbsd" and
               # OS!="netbsd" and OS!="mac" and OS!="aix"
               'host_arch%': 'ia32',
             }],
           ],
         },
         'host_arch%': '<(host_arch)',
         'target_arch%': '<(host_arch)',
-        'v8_target_arch%': '<(host_arch)',
         'base_dir%': '<!(cd <(DEPTH) && python -c "import os; print os.getcwd()")',
 
         # Instrument for code coverage with gcov.
         'coverage%': 0,
-
-        'conditions': [
-          # Set default gomadir.
-          ['OS=="win"', {
-            'gomadir': 'c:\\goma\\goma-win',
-          }, {
-            'gomadir': '<!(/bin/echo -n ${HOME}/goma)',
-          }],
-        ],
       },
       'base_dir%': '<(base_dir)',
       'host_arch%': '<(host_arch)',
       'target_arch%': '<(target_arch)',
-      'v8_target_arch%': '<(v8_target_arch)',
+      'v8_target_arch%': '<(target_arch)',
       'coverage%': '<(coverage)',
-      'use_goma%': '<(use_goma)',
-      'gomadir%': '<(gomadir)',
       'asan%': 0,
       'lsan%': 0,
       'msan%': 0,
       'tsan%': 0,
       # Enable coverage gathering instrumentation in sanitizer tools. This flag
       # also controls coverage granularity (1 for function-level, 2 for
       # block-level, 3 for edge-level).
       'sanitizer_coverage%': 0,
       # Use libc++ (buildtools/third_party/libc++ and
       # buildtools/third_party/libc++abi) instead of stdlibc++ as standard
       # library. This is intended to be used for instrumented builds.
       'use_custom_libcxx%': 0,
 
       'clang_dir%': '<(base_dir)/third_party/llvm-build/Release+Asserts',
 
       'use_lto%': 0,
 
       # Control Flow Integrity for virtual calls and casts.
       # See http://clang.llvm.org/docs/ControlFlowIntegrity.html
       'cfi_vptr%': 0,
       'cfi_diag%': 0,
 
       'cfi_blacklist%': '<(base_dir)/tools/cfi/blacklist.txt',
 
       # Set to 1 to enable fast builds.
       # TODO(machenbach): Only configured for windows.
       'fastbuild%': 0,
 
+      # goma settings.
+      # 1 to use goma.
+      # If no gomadir is set, it uses the default gomadir.
+      'use_goma%': 0,
+      'gomadir%': '',
+
       # Check if valgrind directories are present.
       'has_valgrind%': '<!pymod_do_main(has_valgrind)',
 
       'conditions': [
+        # Set default gomadir.
+        ['OS=="win"', {
+          'gomadir': 'c:\\goma\\goma-win',
+        }, {
+          'gomadir': '<!(/bin/echo -n ${HOME}/goma)',
+        }],
         ['host_arch!="ppc" and host_arch!="ppc64" and host_arch!="ppc64le" and host_arch!="s390" and host_arch!="s390x" and \
           coverage==0', {
           'host_clang%': 1,
         }, {
           'host_clang%': 0,
         }],
         # linux_use_bundled_gold: whether to use the gold linker binary checked
         # into third_party/binutils.  Force this off via GYP_DEFINES when you
         # are using a custom toolchain and need to control -B in ldflags.
         # Do not use 32-bit gold on 32-bit hosts as it runs out address space
         # for component=static_library builds.
         ['(OS=="linux" or OS=="android") and (target_arch=="x64" or target_arch=="arm" or (target_arch=="ia32" and host_arch=="x64"))', {
           'linux_use_bundled_gold%': 1,
         }, {
           'linux_use_bundled_gold%': 0,
         }],
 
         # TODO(machenbach): Remove the conditions as more configurations are
         # supported.
         ['OS=="linux" or OS=="win"', {
           'test_isolation_mode%': 'check',
         }, {
           'test_isolation_mode%': 'noop',
         }],
-
-        ['(OS=="linux" or OS=="mac") and (target_arch=="ia32" or target_arch=="x64") and \
-          (v8_target_arch!="x87" and v8_target_arch!="x32") and coverage==0', {
-          'clang%': 1,
-        }, {
-          'clang%': 0,
-        }],
       ],
     },
     'base_dir%': '<(base_dir)',
     'clang_dir%': '<(clang_dir)',
     'host_arch%': '<(host_arch)',
     'host_clang%': '<(host_clang)',
     'target_arch%': '<(target_arch)',
     'v8_target_arch%': '<(v8_target_arch)',
     'werror%': '-Werror',
     'use_goma%': '<(use_goma)',
     'gomadir%': '<(gomadir)',
-    'clang%': '<(clang)',
     'asan%': '<(asan)',
     'lsan%': '<(lsan)',
     'msan%': '<(msan)',
     'tsan%': '<(tsan)',
     'sanitizer_coverage%': '<(sanitizer_coverage)',
     'use_custom_libcxx%': '<(use_custom_libcxx)',
     'linux_use_bundled_gold%': '<(linux_use_bundled_gold)',
     'use_lto%': '<(use_lto)',
     'cfi_vptr%': '<(cfi_vptr)',
     'cfi_diag%': '<(cfi_diag)',
@@ skipping 58 matching lines @@
         'chromium_win_pch': 0,
         # goma doesn't support PDB yet.
         'fastbuild%': 1,
       }],
       ['((v8_target_arch=="ia32" or v8_target_arch=="x64" or v8_target_arch=="x87") and \
         (OS=="linux" or OS=="mac")) or (v8_target_arch=="ppc64" and OS=="linux")', {
         'v8_enable_gdbjit%': 1,
       }, {
         'v8_enable_gdbjit%': 0,
       }],
+      ['(OS=="linux" or OS=="mac") and (target_arch=="ia32" or target_arch=="x64") and \
+        (v8_target_arch!="x87" and v8_target_arch!="x32") and coverage==0', {
+        'clang%': 1,
+      }, {
+        'clang%': 0,
+      }],
       ['asan==1 or lsan==1 or msan==1 or tsan==1', {
         'clang%': 1,
         'use_allocator%': 'none',
       }],
       ['asan==1 and OS=="linux"', {
         'use_custom_libcxx%': 1,
       }],
       ['tsan==1', {
         'use_custom_libcxx%': 1,
       }],
@@ skipping 103 matching lines @@
         ],
         'android_libcpp_library': 'c++_static',
       }],  # OS=="android"
       ['host_clang==1', {
         'host_cc': '<(clang_dir)/bin/clang',
         'host_cxx': '<(clang_dir)/bin/clang++',
       }, {
         'host_cc': '<!(which gcc)',
         'host_cxx': '<!(which g++)',
       }],
-      ['use_goma==1 and ("<(GENERATOR)"=="ninja" or clang==1)', {
-        'conditions': [
-          ['coverage==1', {
-            'cc_wrapper': '<(base_dir)/build/coverage_wrapper.py <(gomadir)/gomacc',
-          }, {
-            'cc_wrapper': '<(gomadir)/gomacc',
-          }],
-        ],
-      }, {
-        'conditions': [
-          ['coverage==1', {
-            'cc_wrapper': '<(base_dir)/build/coverage_wrapper.py',
-          }, {
-            'cc_wrapper': 0,
-          }],
-        ],
-      }],
     ],
     # Default ARM variable settings.
     'arm_version%': 'default',
     'arm_fpu%': 'vfpv3',
     'arm_float_abi%': 'default',
     'arm_thumb': 'default',
 
     # Default MIPS variable settings.
     'mips_arch_variant%': 'r2',
     # Possible values fp32, fp64, fpxx.
@@ skipping 879 matching lines @@
       'make_global_settings': [
         ['CC', '<!(which arm-linux-gnueabihf-gcc)'],
         ['CXX', '<!(which arm-linux-gnueabihf-g++)'],
         ['CC.host', '<(host_cc)'],
         ['CXX.host', '<(host_cxx)'],
       ],
     }],
     # TODO(yyanagisawa): supports GENERATOR==make
     #  make generator doesn't support CC_wrapper without CC
     #  in make_global_settings yet.
-    ['cc_wrapper!=0', {
+    ['use_goma==1 and ("<(GENERATOR)"=="ninja" or clang==1)', {
       'make_global_settings': [
-       ['CC_wrapper', '<(cc_wrapper)'],
-       ['CXX_wrapper', '<(cc_wrapper)'],
-       ['CC.host_wrapper', '<(cc_wrapper)'],
-       ['CXX.host_wrapper', '<(cc_wrapper)'],
+       ['CC_wrapper', '<(gomadir)/gomacc'],
+       ['CXX_wrapper', '<(gomadir)/gomacc'],
+       ['CC.host_wrapper', '<(gomadir)/gomacc'],
+       ['CXX.host_wrapper', '<(gomadir)/gomacc'],
       ],
     }],
     ['use_lto==1', {
       'target_defaults': {
         'target_conditions': [
           ['_toolset=="target"', {
             'cflags': [
               '-flto',
             ],
           }],
@@ skipping 86 matching lines @@
               '-fsanitize=cfi-vcall',
               '-fsanitize=cfi-derived-cast',
               '-fsanitize=cfi-unrelated-cast',
             ],
           }],
         ],
       },
     }],
   ],
 }