MB: Flip Android bots in chromium.webrtc.fyi to GN.

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 map of buildbot master names -> buildbot builder names ->
   # config names (where each config name is a key in the 'configs' dict,
   # below). MB uses this dict to look up which config to use for a given bot.
   'masters': {
     # Take care when changing any of these builders to ensure that you do not
@@ skipping 535 matching lines @@
       'WebKit Win Builder': 'swarming_gyp_release_bot_minimal_symbols_x86',
       'WebKit Win x64 Builder (dbg)':
         'swarming_gn_debug_bot_minimal_symbols_x64',
       'WebKit Win x64 Builder': 'swarming_gn_release_bot_minimal_symbols_x64',
       'WebKit Win10': 'none',
       'WebKit Win7 (dbg)': 'none',
       'WebKit Win7': 'none',
     },
 
     'chromium.webrtc.fyi': {
-      'Android Builder (dbg)':
-        'android_blink_logging_gyp_debug_static_bot',
-      'Android Builder ARM64 (dbg)':
-        'android_blink_logging_gyp_debug_static_bot_arm64',
+      'Android Builder (dbg)': 'android_gn_debug_static_bot',
+      'Android Builder ARM64 (dbg)': 'android_gn_debug_static_bot_arm64',
       'Android GN (dbg)': 'android_gn_debug_bot',
       'Android GN': 'android_gn_release_bot',
       'Android Tests (dbg) (K Nexus5)': 'none',
       'Android Tests (dbg) (L Nexus5)': 'none',
       'Android Tests (dbg) (L Nexus6)': 'none',
       'Android Tests (dbg) (L Nexus7.2)': 'none',
       'Android Tests (dbg) (L Nexus9)': 'none',
       'Linux Builder': 'gn_release_bot_chrome_with_codecs',
       'Linux Tester': 'none',
       'Mac Builder': 'chrome_with_codecs_blink_logging_gyp_release_trybot',
@@ skipping 44 matching lines @@
       'precise64 beta': 'gn_official',
       'precise64 stable': 'gn_official',
       'precise64 trunk': 'gn_official',
       'win beta': 'gyp_official',
       'win stable': 'gyp_official',
       'win trunk': 'gyp_official',
     },
 
     'tryserver.blink': {
       # Most tryservers should have '_trybot' in their config names, but
-      # 'release_trybot' includes 'dcheck_always_on', and the blink 
+      # 'release_trybot' includes 'dcheck_always_on', and the blink
       # release trybots must *not* enable dchecks, because that could
       # cause them to produce different baselines than the release
       # waterfall bots, and run-webkit-tests can't handle that (by design).
       'linux_blink_compile_dbg': 'swarming_gn_debug_trybot',
       'linux_blink_compile_rel': 'swarming_gn_release_bot_minimal_symbols',
       'linux_blink_dbg': 'swarming_gn_debug_trybot',
       'linux_blink_rel': 'swarming_gn_release_bot_minimal_symbols',
       'mac_blink_compile_dbg': 'swarming_gyp_debug_trybot',
       'mac_blink_compile_rel': 'swarming_gyp_release_bot_minimal_symbols',
       'mac_blink_dbg': 'swarming_gyp_debug_trybot',
@@ skipping 236 matching lines @@
   # This is the list of configs that you can pass to mb; each config
   # represents a particular combination of GYP_DEFINES/gn args that
   # we must support. A given config *may* be platform-specific but
   # is not necessarily so (i.e., we might have mac, win, and linux
   # bots all using the 'gn_release_bot' config).
   'configs': {
     'android_asan_gn_clang_shared_debug_minimal_symbols': [
       'android', 'asan', 'gn', 'clang', 'shared', 'debug', 'minimal_symbols',
     ],
 
-    'android_blink_logging_gyp_debug_static_bot': [
-      'android', 'blink_logging', 'gyp', 'debug_static_bot',
-    ],
-
-    'android_blink_logging_gyp_debug_static_bot_arm64': [
-      'android', 'blink_logging', 'gyp', 'debug_static_bot', 'arm64',
-    ],
-
     'android_cast_gn_debug_static_bot': [
       'android', 'cast', 'gn', 'clang', 'debug_static_bot',
     ],
 
     'android_clang_asan_findbugs_gn_debug_bot_minimal_symbols': [
       'android', 'clang', 'asan', 'findbugs', 'gn',
       'debug_bot_minimal_symbols',
     ],
 
     'android_clang_asan_findbugs_gn_debug_trybot': [
@@ skipping 308 matching lines @@
     'gyp_asan_edge_fuzzer_v8_heap_symbolized_release_bot_hybrid': [
       'gyp', 'asan', 'edge', 'fuzzer', 'v8_heap', 'symbolized',
       'release_bot', 'hybrid',
     ],
 
     'gyp_asan_fuzzer_v8_heap_chrome_with_codecs_release_bot': [
       'gyp', 'asan', 'fuzzer', 'v8_heap', 'chrome_with_codecs', 'release_bot',
     ],
 
     'gyp_asan_fuzzer_v8_heap_chrome_with_codecs_release_static_x86': [
-      'gyp', 'asan', 'fuzzer', 'v8_heap', 'chrome_with_codecs', 
+      'gyp', 'asan', 'fuzzer', 'v8_heap', 'chrome_with_codecs',
       'release', 'static', 'x86',
     ],
 
     'gyp_asan_fuzzer_v8_heap_debug_symbols_static_bot': [
       'gyp', 'asan', 'fuzzer', 'v8_heap',  'debug_symbols_static_bot',
     ],
 
     'gyp_asan_fuzzer_v8_heap_release_bot': [
       'gyp', 'asan', 'fuzzer', 'v8_heap', 'release_bot',
     ],
 
     'gyp_asan_fuzzer_v8_heap_release_static_x86': [
       'gyp', 'asan', 'fuzzer', 'v8_heap', 'release', 'static', 'x86',
     ],
 
     'gyp_asan_lsan_edge_fuzzer_debug_bot': [
       'gyp', 'asan', 'lsan', 'edge', 'fuzzer', 'debug_bot',
     ],
 
     'gyp_asan_lsan_edge_fuzzer_v8_heap_chromeos_codecs_release_bot': [
-      'gyp', 'asan', 'lsan', 'edge', 'v8_heap', 'chromeos_codecs', 
+      'gyp', 'asan', 'lsan', 'edge', 'v8_heap', 'chromeos_codecs',
       'release_bot',
     ],
 
     'gyp_asan_lsan_edge_fuzzer_v8_heap_release_bot': [
       'gyp', 'asan', 'lsan', 'edge', 'fuzzer', 'v8_heap', 'release_bot',
     ],
 
     'gyp_asan_lsan_edge_fuzzer_v8_heap_symbolized_release_bot': [
       'gyp', 'asan', 'lsan', 'edge', 'v8_heap', 'symbolized', 'release_bot',
     ],
@@ skipping 1040 matching lines @@
     },
 
     'drfuzz': { 'gn_args': 'use_drfuzz=true' },
 
     'drmemory': {
       'gn_args': 'is_component_build=true enable_iterator_debugging=false',
       'gyp_defines': 'component=shared_library build_for_tool=drmemory',
     },
   },
 }