Revert of Remove all of the CrOS Ozone configs from MB.

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 73 matching lines @@
       'Linux': 'release_bot',
       'Linux32': 'release_bot_x86',
     },
 
     'chromium.chromiumos': {
       'ChromiumOS amd64-generic Compile': 'cros_chrome_sdk',
       'ChromiumOS daisy Compile': 'cros_chrome_sdk',
       'Linux ChromiumOS Builder': 'chromeos_with_codecs_release_bot',
       'Linux ChromiumOS Builder (dbg)': 'chromeos_with_codecs_debug_bot',
       'Linux ChromiumOS Full': 'chromeos_with_codecs_release_bot',
-      'Linux ChromiumOS Ozone Builder': 'chromeos_with_codecs_release_bot',
+      '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_recover_release_static',
@@ skipping 92 matching lines @@
       'Linux ARM (dbg)': 'debug_bot_arm',
       'Linux ARM64': 'release_bot_arm64',
       'Linux ARM64 (dbg)': 'debug_bot_arm64',
       'Linux Clang Analyzer': 'linux_chromium_analysis',
       'Linux deterministic': 'release_bot',
       'Linux deterministic (dbg)': 'debug_bot',
       'Linux remote_run Builder': 'release_bot',
       'Linux remote_run Tester': 'release_bot',
       'Mac deterministic': 'release_bot_mac_strip',
       'Mac deterministic (dbg)': 'debug_bot',
-      'Mojo ChromiumOS': 'chromeos_with_codecs_release_trybot',
+      'Mojo ChromiumOS': 'chromeos_with_codecs_ozone_release_trybot',
       'Mojo Linux': 'release_trybot',
       'Mojo Windows': 'release_bot_x86_minimal_symbols',
-      'Ozone Linux': 'ozone_linux_release_bot',
+      'Ozone Linux': 'release_bot_ozone_linux',
       'Site Isolation Android': 'android_release_bot_minimal_symbols_arm64',
       'Site Isolation Linux': 'release_trybot',
       'Site Isolation Win': 'release_trybot_x86',
       'ThinLTO Linux ToT': 'thin_lto_clang_tot_full_symbols_release_static_use_lld',
       'UBSanVptr Linux': 'ubsan_vptr_release_bot',
       'WebKit Linux - RandomOrder': 'release_trybot',
       'WebKit Mac - RandomOrder': 'release_trybot',
       'WebKit Win - RandomOrder': 'release_bot_x86_minimal_symbols',
       'Win 10 Fast Ring': 'release_trybot',
       'Windows deterministic': 'release_bot_x86_minimal_symbols',
@@ skipping 30 matching lines @@
       'GPU Linux Builder (dbg)': 'gpu_fyi_tests_debug_trybot',
       'GPU Linux Builder': 'gpu_fyi_tests_release_trybot',
       'GPU Mac Builder': 'gpu_fyi_tests_release_trybot',
       'GPU Mac Builder (dbg)': 'gpu_fyi_tests_debug_trybot',
       'GPU Win Builder': 'gpu_tests_deqp_gles_release_trybot_x86',
       'GPU Win Builder (dbg)': 'gpu_tests_deqp_gles_debug_trybot_x86',
       'GPU Win Clang Builder (dbg)': 'gpu_fyi_tests_win_clang_debug_bot',
       'GPU Win x64 Builder': 'gpu_tests_deqp_gles_release_trybot',
       'GPU Win x64 Builder (dbg)': 'gpu_tests_deqp_gles_debug_trybot',
       'Linux ChromiumOS Builder': 'gpu_fyi_tests_chromeos_release_trybot',
-      'Linux ChromiumOS Ozone Builder': 'gpu_fyi_tests_chromeos_release_trybot',
+      'Linux ChromiumOS Ozone Builder': 'gpu_fyi_tests_chromeos_ozone_release_trybot',
       'Linux GPU TSAN Release': 'gpu_fyi_tests_release_trybot_tsan',
       'Mac GPU ASAN Release': 'gpu_fyi_tests_release_trybot_asan',
     },
 
     'chromium.infra.codesearch': {
       'codesearch-gen-chromium-android': {
         'android': 'codesearch_gen_chromium_android_bot',
       },
       'codesearch-gen-chromium-chromiumos': {
         'chromeos': 'codesearch_gen_chromium_chromiumos_bot',
@@ skipping 258 matching lines @@
       'linux_arm64_rel': 'release_trybot_arm64',
       'linux_chromium_archive_rel_ng': 'release_bot',
       'linux_chromium_asan_rel_ng': 'asan_lsan_release_trybot',
       'linux_chromium_browser_side_navigation_rel': 'release_trybot',
       'linux_chromium_cfi_rel_ng': 'cfi_full_cfi_diag_thin_lto_release_static_dcheck_always_on_goma',
       'linux_chromium_chromeos_asan_rel_ng': 'asan_lsan_chromeos_release_trybot',
       'linux_chromium_chromeos_compile_dbg_ng': 'chromeos_with_codecs_debug_trybot',
       'linux_chromium_chromeos_compile_rel_ng': 'chromeos_with_codecs_release_trybot',
       'linux_chromium_chromeos_dbg_ng': 'chromeos_with_codecs_debug_trybot',
       'linux_chromium_chromeos_msan_rel_ng': 'chromeos_msan_release_bot',
-      'linux_chromium_chromeos_ozone_rel_ng': 'chromeos_with_codecs_release_trybot',
+      'linux_chromium_chromeos_ozone_rel_ng': 'chromeos_with_codecs_ozone_release_trybot',
       'linux_chromium_chromeos_rel_ng': 'chromeos_with_codecs_release_trybot',
       'linux_chromium_clobber_deterministic': 'release_trybot',
       'linux_chromium_clobber_rel_ng': 'release_trybot',
       'linux_chromium_compile_dbg_32_ng': 'debug_trybot_x86',
       'linux_chromium_compile_dbg_ng': 'debug_trybot',
       'linux_chromium_compile_rel_ng': 'release_trybot',
       'linux_chromium_dbg_32_ng': 'debug_trybot_x86',
       'linux_chromium_dbg_ng': 'debug_trybot',
       'linux_chromium_gn_upload': 'gn_linux_upload',
       'linux_chromium_headless_rel': 'headless_linux_release_trybot',
@@ skipping 387 matching lines @@
 
     'asan_fuzzer_v8_heap_chrome_with_codecs_release_bot_x86': [
       'clang', 'asan', 'fuzzer', 'v8_heap', 'chrome_with_codecs', 'release_bot', 'x86',
     ],
 
     'asan_fuzzer_v8_heap_release_bot_x86': [
       'clang', 'asan', 'fuzzer', 'v8_heap', 'release_bot', 'x86',
     ],
 
     'asan_lsan_chromeos_release_trybot': [
-      'asan', 'lsan', 'chromeos', 'release_trybot',
+      'asan', 'lsan', 'chromeos', 'x11_cros', 'release_trybot',
     ],
 
     'asan_lsan_edge_debug_bot': [
       'asan', 'lsan', 'edge', 'debug_bot',
     ],
 
     'asan_lsan_edge_fuzzer_v8_heap_chromeos_codecs_release_bot': [
       'asan', 'lsan', 'edge', 'v8_heap', 'chromeos_codecs', 'release_bot',
     ],
 
@@ skipping 47 matching lines @@
 
     'chrome_with_codecs_blink_logging_release_trybot': [
       'chrome_with_codecs', 'blink_logging', 'release_trybot',
     ],
 
     'chrome_with_codecs_blink_logging_release_trybot_x86': [
       'chrome_with_codecs', 'blink_logging', 'release_trybot', 'x86',
     ],
 
     'chromeos_asan_lsan_edge_fuzzer_v8_heap_release_bot': [
-      'chromeos', 'asan', 'lsan', 'edge', 'fuzzer', 'v8_heap', 'release_bot',
+      'chromeos', 'x11_cros', 'asan', 'lsan', 'edge', 'fuzzer', 'v8_heap', 'release_bot',
     ],
 
     'chromeos_msan_release_bot': [
-      'chromeos', 'msan', 'release_bot',
+      'chromeos', 'x11_cros', 'msan', 'release_bot',
     ],
 
     'chromeos_with_codecs_debug_bot': [
-      'chromeos_with_codecs', 'debug_bot',
+      'chromeos_with_codecs', 'x11_cros', 'debug_bot',
     ],
 
     'chromeos_with_codecs_debug_trybot': [
-      'chromeos_with_codecs', 'debug_trybot',
+      'chromeos_with_codecs', 'x11_cros', 'debug_trybot',
+    ],
+
+    'chromeos_with_codecs_ozone_release_bot': [
+      'chromeos_with_codecs', 'ozone', 'release_bot',
+    ],
+
+    'chromeos_with_codecs_ozone_release_trybot': [
+      'chromeos_with_codecs', 'ozone', 'release_trybot',
     ],
 
     'chromeos_with_codecs_release_bot': [
-      'chromeos_with_codecs', 'release_bot',
+      'chromeos_with_codecs', 'x11_cros', 'release_bot',
     ],
 
     'chromeos_with_codecs_release_trybot': [
-      'chromeos_with_codecs', 'release_trybot',
+      'chromeos_with_codecs', 'x11_cros', 'release_trybot',
     ],
 
     'clang_debug_trybot_x86': [
       'clang', 'debug_trybot', 'x86',
     ],
 
     'clang_debug_bot_minimal_symbols_x86': [
       'clang', 'debug_bot', 'minimal_symbols', 'x86',
     ],
 
@@ skipping 106 matching lines @@
     'codesearch': [
       # The Codesearch bots run their own recipe and invoke GN directly.
       'error',
     ],
 
     'codesearch_gen_chromium_android_bot': [
       'goma', 'clang', 'shared', 'debug', 'minimal_symbols', 'arm', 'android_without_codecs',
     ],
 
     'codesearch_gen_chromium_chromiumos_bot': [
-      'goma', 'clang', 'shared', 'debug', 'minimal_symbols', 'x64', 'chromeos',
+      'goma', 'clang', 'shared', 'debug', 'minimal_symbols', 'x64', 'chromeos', 'ozone',
     ],
 
     'codesearch_gen_chromium_linux_bot': [
       'goma', 'clang', 'shared', 'debug', 'minimal_symbols', 'x64',
     ],
 
     # The 'cros_chrome_sdk_* configs are placeholders that indicate
     # that the GN args are set by the `cros chrome-sdk`
     # wrapper and need to be looked at specially.
     'cros_chrome_sdk': [
@@ skipping 43 matching lines @@
     ],
 
     'debug_trybot_x86': [
       'debug_trybot', 'x86',
     ],
 
     'debug_trybot_x86_minimal_symbols': [
       'debug_trybot', 'x86',
     ],
 
+    'gpu_fyi_tests_chromeos_ozone_release_trybot': [
+      'gpu_fyi_tests', 'release_trybot', 'ozone', 'ozone_linux', 'system_gbm_libdrm',
+    ],
+
     'gpu_fyi_tests_chromeos_release_trybot': [
-      'gpu_fyi_tests', 'release_trybot', 'chromeos', 'system_gbm_libdrm',
+      'gpu_fyi_tests', 'release_trybot', 'chromeos', 'x11_cros',
     ],
 
     'gpu_fyi_tests_debug_trybot': [
       'gpu_fyi_tests', 'debug_trybot',
     ],
 
     'gpu_fyi_tests_release_trybot': [
       'gpu_fyi_tests', 'release_trybot',
     ],
 
@@ skipping 108 matching lines @@
 
     'official_goma': [
       'official', 'goma',
     ],
 
     'official_goma_perf': [
       'official', 'goma', 'no_gnome_keyring',
     ],
 
     'official_goma_chromeos': [
-      'official', 'goma', 'chromeos',
+      'official', 'goma', 'chromeos', 'x11_cros',
     ],
 
     'official_goma_thin_lto_use_lld': [
       'official', 'goma', 'thin_lto', 'use_lld',
     ],
 
     'official_goma_minimal_symbols_android': [
       'official', 'goma', 'minimal_symbols', 'android',
     ],
 
@@ skipping 14 matching lines @@
     ],
 
     'official_optimize_chrome_pgo_phase_2': [
       'official_optimize', 'chrome_pgo_phase_2',
     ],
 
     'official_optimize_chrome_pgo_phase_2_x86': [
       'official_optimize', 'chrome_pgo_phase_2', 'x86',
     ],
 
-    'ozone_linux_release_bot': [
-      'ozone_linux', 'release_bot',
+    'release_bot_ozone_linux': [
+      'release_bot', 'ozone', 'ozone_linux',
+    ],
+
+    'release_bot_fuchsia': [
+      'release_bot', 'fuchsia',
     ],
 
     'ozone_linux_release_trybot': [
-      'ozone_linux', 'release_trybot',
+      'release_trybot', 'ozone', 'ozone_linux',
     ],
 
     'release_afl_asan': [
       'release', 'afl', 'asan', 'chromeos_codecs', 'pdf_xfa', 'disable_nacl',
     ],
 
     'release_bot': [
       'release_bot',
     ],
 
     'release_bot_arm': [
       'release_bot', 'arm',
     ],
 
     'release_bot_arm64': [
       'release_bot', 'arm64',
     ],
 
     'release_bot_chrome_with_codecs': [
       'release_bot', 'chrome_with_codecs',
     ],
 
-    'release_bot_fuchsia': [
-      'release_bot', 'fuchsia',
-    ],
-
     'release_bot_mac_new_sdk': [
       'release_bot', 'mac_new_sdk',
     ],
 
     'release_bot_mac_strip': [
       'release_bot', 'mac_strip',
     ],
 
     'release_bot_x86': [
       'release_bot', 'x86',
@@ skipping 396 matching lines @@
     },
 
     'no_pch': {
       'gn_args': 'enable_precompiled_headers=false',
     },
 
     'no_symbols': {
       'gn_args': 'symbol_level=0',
     },
 
+    'x11_cros': {
+      # When use_ozone=false then use_x11=true.
+      'gn_args': 'use_ozone=false',
+    },
+
     'official': {
       'mixins': ['official_optimize'],
       'gn_args': 'is_chrome_branded=true',
     },
 
     'official_optimize': {
       'gn_args': 'is_official_build=true is_debug=false',
     },
 
     'optimize_for_fuzzing': {
       'gn_args': 'optimize_for_fuzzing=true',
     },
 
+    'ozone': {
+      'gn_args': 'use_ozone=true',
+    },
+
     'ozone_linux': {
       'gn_args': ('ozone_auto_platforms=false ozone_platform_wayland=true '
                   'ozone_platform="x11" '
                   'ozone_platform_x11=true ozone_platform_gbm=true '
                   'enable_package_mash_services=true use_ash=false '
-                  'use_xkbcommon=true use_ozone=true'),
+                  'use_xkbcommon=true'),
     },
 
     'fuchsia': {
       'gn_args': 'target_os="fuchsia"',
     },
 
     'pdf_xfa': {
       'gn_args': 'pdf_enable_xfa=true',
     },
 
@@ skipping 83 matching lines @@
 
     'x64': {
       'gn_args': 'target_cpu="x64"',
     },
 
     'x86': {
       'gn_args': 'target_cpu="x86"',
     },
   },
 }