GN: Add an explicit gn arg for recovery in CFI

tools/mb/mb_config.pyl

 # Copyright 2015 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # This is a .pyl, or "Python Literal", file. You can treat it just like a
 # .json file, with the following exceptions:
 # * all keys must be quoted (use single quotes, please);
 # * comments are allowed, using '#' syntax; and
 # * trailing commas are allowed.
 
@@ skipping 84 matching lines @@
       'Linux ChromiumOS Ozone Builder': 'chromeos_with_codecs_ozone_release_bot',
     },
 
     'chromium.fyi': {
       'Afl Upload Linux ASan': 'release_afl_asan',
       'Android Builder (dbg)': 'android_debug_static_bot',
       'Android Builder Goma Canary (dbg)': 'android_debug_bot',
       'Android deterministic': 'android_without_codecs_release_bot_minimal_symbols',
       'Android deterministic (dbg)': 'android_debug_bot',
       'Browser Side Navigation Linux': 'release_bot',
-      'CFI Linux CF': 'cfi_full_cfi_diag_release_static',
+      'CFI Linux CF': 'cfi_full_cfi_diag_recover_release_static',
       'CFI Linux ToT': 'cfi_full_clang_tot_release_static',
       'CFI Linux': 'cfi_release_static',
       'CFI Linux Full': 'cfi_thin_lto_full_release_static_use_lld',
       'CFI ThinLTO Linux ToT': 'cfi_thin_lto_clang_tot_full_symbols_release_static_use_lld',
       'Chromium Linux Goma Canary': 'release_bot',
       'Chromium Linux Goma Canary': 'release_bot',
       'Chromium Linux Goma Canary (clobber)': 'release_bot',
       'Chromium Linux Goma Canary LocalOutputCache': 'release_bot',
       'Chromium Linux Precise Goma LinkTest': 'release_bot',
       'Chromium Linux32 Goma Canary (clobber)': 'release_bot_x86',
@@ skipping 850 matching lines @@
     ],
 
     'cast_audio_release_bot': [
       'cast', 'cast_audio', 'release_bot',
     ],
 
     'cast_audio_release_trybot': [
       'cast', 'cast_audio', 'release_trybot',
     ],
 
-    'cfi_full_cfi_diag_release_static': [
-      'cfi_full', 'cfi_diag', 'release', 'static',
+    'cfi_full_cfi_diag_recover_release_static': [
+      'cfi_full', 'cfi_diag', 'cfi_recover', 'release', 'static',
     ],
 
     'cfi_full_clang_tot_release_static': [
       'cfi_full', 'clang_tot', 'release', 'static',
     ],
 
     'cfi_full_release_static_dcheck_always_on': [
       'cfi_full', 'release', 'static', 'dcheck_always_on',
     ],
 
@@ skipping 591 matching lines @@
 
     'cfi_full': {
       'gn_args': 'use_cfi_cast=true',
       'mixins': ['cfi'],
     },
 
     'cfi_diag': {
       'gn_args': 'use_cfi_diag=true',
     },
 
+    'cfi_recover': {
+      'gn_args': 'use_cfi_recover=true',
+    },
+
     'chrome_pgo_phase_1': {
       'gn_args': 'chrome_pgo_phase=1',
     },
 
     'chrome_pgo_phase_2': {
       'gn_args': 'chrome_pgo_phase=2',
     },
 
     'chrome_with_codecs': {
       'mixins': ['ffmpeg_branding_chrome', 'proprietary_codecs'],
@@ skipping 318 matching lines @@
 
     'x64': {
       'gn_args': 'target_cpu="x64"',
     },
 
     'x86': {
       'gn_args': 'target_cpu="x86"',
     },
   },
 }