[code coverage] Pass '--coverage-dir' when Clang coverage is on

Android instrumentation tests and gtests cannot be separated at mb
so we pass '--coverage-dir' to both if any coverage turned on
and tackle it at runner side for '--coverage-dir'.

Also changed 'java_coverage' to 'use_java_coverage' to be consistent.

Bug: 985574
Change-Id: Ia3d99f07292b49714196e3c296d3234420bee0ed
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1876492
Commit-Queue: Yun Liu <yliuyliu@google.com>
Reviewed-by: John Budorick <jbudorick@chromium.org>
Cr-Commit-Position: refs/heads/master@{#708880}

tools/mb/mb.py

@@ -1358,6 +1358,7 @@ class MetaBuildWrapper(object):
     msan = 'is_msan=true' in vals['gn_args']
     tsan = 'is_tsan=true' in vals['gn_args']
     cfi_diag = 'use_cfi_diag=true' in vals['gn_args']
+    clang_coverage = 'use_clang_coverage=true' in vals['gn_args']
     java_coverage = 'use_jacoco_coverage=true' in vals['gn_args']
 
     test_type = isolate_map[target]['type']
@@ -1405,7 +1406,7 @@ class MetaBuildWrapper(object):
           '--target', target,
           '--logdog-bin-cmd', '../../bin/logdog_butler',
           '--store-tombstones']
-      if java_coverage:
+      if clang_coverage or java_coverage:
         cmdline += ['--coverage-dir', '${ISOLATED_OUTDIR}']
     elif is_fuchsia and test_type != 'script':
       cmdline += [

tools/mb/mb_config.pyl

@@ -1095,7 +1095,7 @@
     ],
 
     'android_debug_trybot_java_coverage': [
-      'android', 'debug_trybot', 'java_coverage', 'strip_debug_info',
+      'android', 'debug_trybot', 'use_java_coverage', 'strip_debug_info',
     ],
 
     'android_incremental_debug_bot': [
@@ -1114,7 +1114,7 @@
 
     'android_release_bot_minimal_symbols_arm64_coverage': [
       'android', 'release_bot', 'minimal_symbols', 'arm64',
-      'strip_debug_info', 'java_coverage',
+      'strip_debug_info', 'use_java_coverage',
     ],
 
     'android_release_bot_minimal_symbols_arm64_webview_google': [
@@ -1417,6 +1417,10 @@
       'clang_tot', 'tsan', 'release',
     ],
 
+    'clang_tot_win_release_cross': [
+      'clang_tot', 'win_cross', 'minimal_symbols', 'shared', 'release', 'dcheck_always_on',
+    ],
+
     'closure_compilation': [
       # The closure bots run their own recipe and shouldn't go through MB.
       'error',
@@ -1513,18 +1517,6 @@
       'debug_bot', 'x86', 'no_com_init_hooks', 'chrome_with_codecs'
     ],
 
-    'libfuzzer_asan_debug_bot_v8_arm64': [
-      'libfuzzer', 'asan', 'debug_bot', 'shared', 'chromeos_codecs', 'pdf_xfa', 'disable_nacl', 'optimize_for_fuzzing', 'v8_simulate_arm64', 'disable_seed_corpus',
-    ],
-
-    'libfuzzer_asan_debug_bot_x86': [
-      'libfuzzer', 'asan', 'debug_bot', 'shared', 'chromeos_codecs', 'pdf_xfa', 'disable_nacl', 'optimize_for_fuzzing', 'x86', 'x86_host',  'disable_seed_corpus',
-    ],
-
-    'libfuzzer_asan_debug_bot_x86_v8_arm': [
-      'libfuzzer', 'asan', 'debug_bot', 'shared', 'chromeos_codecs', 'pdf_xfa', 'disable_nacl', 'optimize_for_fuzzing', 'x86_host', 'v8_simulate_arm',  'disable_seed_corpus',
-    ],
-
     'debug_trybot': [
       'debug_trybot',
     ],
@@ -1612,7 +1604,7 @@
 
     'gpu_tests_android_release_trybot_arm64_resource_whitelisting_java_coverage': [
       'android', 'release_trybot', 'arm64', 'static_angle', 'resource_whitelisting',
-      'java_coverage', 'partial_code_coverage_instrumentation',
+      'use_java_coverage', 'partial_code_coverage_instrumentation',
     ],
 
     'gpu_tests_android_vulkan_release_trybot': [
@@ -1711,6 +1703,18 @@
       'libfuzzer', 'asan', 'debug_bot', 'shared', 'chromeos_codecs', 'pdf_xfa', 'disable_nacl', 'optimize_for_fuzzing', 'disable_seed_corpus',
     ],
 
+    'libfuzzer_asan_debug_bot_v8_arm64': [
+      'libfuzzer', 'asan', 'debug_bot', 'shared', 'chromeos_codecs', 'pdf_xfa', 'disable_nacl', 'optimize_for_fuzzing', 'v8_simulate_arm64', 'disable_seed_corpus',
+    ],
+
+    'libfuzzer_asan_debug_bot_x86': [
+      'libfuzzer', 'asan', 'debug_bot', 'shared', 'chromeos_codecs', 'pdf_xfa', 'disable_nacl', 'optimize_for_fuzzing', 'x86', 'x86_host',  'disable_seed_corpus',
+    ],
+
+    'libfuzzer_asan_debug_bot_x86_v8_arm': [
+      'libfuzzer', 'asan', 'debug_bot', 'shared', 'chromeos_codecs', 'pdf_xfa', 'disable_nacl', 'optimize_for_fuzzing', 'x86_host', 'v8_simulate_arm',  'disable_seed_corpus',
+    ],
+
     'libfuzzer_chromeos_asan_release_bot': [
       'libfuzzer', 'asan', 'shared_release_bot', 'chromeos_with_codecs', 'pdf_xfa', 'disable_nacl', 'optimize_for_fuzzing', 'disable_seed_corpus',
     ],
@@ -2001,10 +2005,6 @@
     'win32_arm64_release_bot': [
       'arm64', 'disable_nacl', 'minimal_symbols', 'release_bot',
     ],
-
-    'clang_tot_win_release_cross': [
-      'clang_tot', 'win_cross', 'minimal_symbols', 'shared', 'release', 'dcheck_always_on',
-    ],
   },
 
   # This is a dict mapping a given 'mixin' name to a dict of settings that
@@ -2053,14 +2053,6 @@
       'gn_args': 'is_asan=true',
     },
 
-    'ffmpeg_branding_chrome': {
-      'gn_args': 'ffmpeg_branding="Chrome"',
-    },
-
-    'ffmpeg_branding_chromeos': {
-      'gn_args': 'ffmpeg_branding="ChromeOS"',
-    },
-
     'cast': {
       'gn_args': 'is_chromecast=true'
     },
@@ -2119,18 +2111,6 @@
       'gn_args': 'is_clang=true',
     },
 
-    'no_clang': {
-      'gn_args': 'is_clang=false',
-    },
-
-    'use_clang_coverage': {
-      'gn_args': 'use_clang_coverage=true',
-    },
-
-    'use_cxx11': {
-      'gn_args': 'use_cxx11=true',
-    },
-
     # Settings used by the codesearch builders to generate cross-references.
     'codesearch': {
       'gn_args': 'clang_use_chrome_plugins=false enable_kythe_annotations=true',
@@ -2229,6 +2209,10 @@
       'gn_args': 'error',
     },
 
+    'ffmpeg_branding_chrome': {
+      'gn_args': 'ffmpeg_branding="Chrome"',
+    },
+
     'ffmpeg_branding_chromeos': {
       'gn_args': 'ffmpeg_branding="ChromeOS"',
     },
@@ -2290,10 +2274,6 @@
       'gn_args': 'target_cpu="x64"',
     },
 
-    'java_coverage': {
-      'gn_args': 'use_jacoco_coverage=true',
-    },
-
     'libcxx': {
       'gn_args': 'use_custom_libcxx=true',
     },
@@ -2328,6 +2308,10 @@
       'gn_args': 'is_msan=true msan_track_origins=0',
     },
 
+    'no_clang': {
+      'gn_args': 'is_clang=false',
+    },
+
     'no_com_init_hooks': {
       'gn_args': 'com_init_check_hook_disabled=true',
     },
@@ -2409,6 +2393,10 @@
       'mixins': ['release_bot', 'minimal_symbols', 'dcheck_always_on'],
     },
 
+    'resource_whitelisting': {
+      'gn_args': 'enable_resource_whitelist_generation=true',
+    },
+
     'shared': {
       'gn_args': 'is_component_build=true',
     },
@@ -2421,6 +2409,10 @@
       'mixins': ['shared_release_bot', 'minimal_symbols', 'dcheck_always_on'],
     },
 
+    'stable_channel': {
+      'gn_args': 'android_channel="stable"',
+    },
+
     'static': {
       'gn_args': 'is_component_build=false',
     },
@@ -2445,18 +2437,6 @@
       'gn_args': 'use_thin_lto=true thin_lto_enable_optimizations=true',
     },
 
-    'win_linker_timing': {
-      'gn_args': 'win_linker_timing=true',
-    },
-
-    'resource_whitelisting': {
-      'gn_args': 'enable_resource_whitelist_generation=true',
-    },
-
-    'stable_channel': {
-      'gn_args': 'android_channel="stable"',
-    },
-
     'tsan': {
       'gn_args': 'is_tsan=true',
     },
@@ -2478,12 +2458,24 @@
       'gn_args': 'is_ubsan_vptr=true',
     },
 
+    'use_clang_coverage': {
+      'gn_args': 'use_clang_coverage=true',
+    },
+
+    'use_cxx11': {
+      'gn_args': 'use_cxx11=true',
+    },
+
     # TODO(crbug.com/869348): Remove this if we set this by default or don't use
     # this feature.
     'use_dummy_lastchange': {
       'gn_args': 'use_dummy_lastchange=true',
     },
 
+    'use_java_coverage': {
+      'gn_args': 'use_jacoco_coverage=true',
+    },
+
     'v8_simulate_arm': {
       'gn_args': 'target_cpu="x86" v8_target_cpu="arm"',
     },
@@ -2524,6 +2516,10 @@
       'gn_args': 'target_os="win"',
     },
 
+    'win_linker_timing': {
+      'gn_args': 'win_linker_timing=true',
+    },
+
     'x64': {
       'gn_args': 'target_cpu="x64"',
     },