Revert of [coverage] Filter some files from instrumentation.

build/standalone.gypi

Index: build/standalone.gypi
diff --git a/build/standalone.gypi b/build/standalone.gypi
index e92d4fe0343d6256a995f2984e3ccd06551e01a0..5269b95f64dbd9cf2f6ecba7c9c0d8764a4bf550 100644
--- a/build/standalone.gypi
+++ b/build/standalone.gypi
@@ -48,12 +48,6 @@
     '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 \
@@ -72,28 +66,16 @@
         },
         '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,
@@ -122,10 +104,22 @@
       # 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,
@@ -150,13 +144,6 @@
         }, {
           '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)',
@@ -168,7 +155,6 @@
     'werror%': '-Werror',
     'use_goma%': '<(use_goma)',
     'gomadir%': '<(gomadir)',
-    'clang%': '<(clang)',
     'asan%': '<(asan)',
     'lsan%': '<(lsan)',
     'msan%': '<(msan)',
@@ -246,6 +232,12 @@
         '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,
@@ -369,23 +361,6 @@
       }, {
         '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.
@@ -1286,12 +1261,12 @@
     # 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', {