Switch android bots on chromium.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 83 matching lines @@
       'Chromium Mac 10.11': 'tbd',
       'Chromium Mac 10.11 Force Mac Toolchain': 'tbd',
       'Chromium Mac 10.9 Goma Canary': 'tbd',
       'Chromium Mac 10.9 Goma Canary (clobber)': 'tbd',
       'Chromium Mac 10.9 Goma Canary (dbg)': 'tbd',
       'Chromium Mac 10.9 Goma Canary (dbg)(clobber)': 'tbd',
       'Chromium Win 10': 'tbd',
       'Chromium Win x64 Clobber': 'tbd',
       'ChromiumOS Linux Tests': 'tbd',
       'ClangToTAndroidASan':
-        'android_clang_no_chrome_plugins_asan_gyp_debug_bot_minimal_symbols',
+        'android_clang_no_chrome_plugins_asan_gn_debug_bot_minimal_symbols',
       'ClangToTLinux': 'tbd',
       'ClangToTLinux (dbg)': 'tbd',
       'ClangToTLinuxASan': 'tbd',
       'ClangToTLinuxUBSanVptr': 'tbd',
       'ClangToTMac': 'tbd',
       'ClangToTMac (dbg)': 'tbd',
       'ClangToTMacASan': 'tbd',
       'ClangToTWin': 'tbd',
       'ClangToTWin(dbg)': 'tbd',
       'ClangToTWin(dll)': 'tbd',
@@ skipping 24 matching lines @@
       'MD Top Chrome ChromeOS material-hybrid': 'tbd',
       'MD Top Chrome ChromeOS non-material': 'tbd',
       'MD Top Chrome Linux material': 'tbd',
       'MD Top Chrome Win material': 'tbd',
       'Ozone ECS Linux': 'tbd',
       'Windows 8 App Certification': 'tbd',
       'Windows Builder (DrMemory)': 'tbd',
       'Windows Tests (DrMemory)': 'tbd',
 
       'Android ChromeDriver Tests (dbg)': 'none',
-      'Android Cloud Tests': 'android_gyp_debug_static_bot_x86',
+      'Android Cloud Tests': 'android_gn_debug_static_bot_x86',
       'Android Remoting Tests': 'none',
       'Android Tests (trial)(dbg)': 'none',
-      'Android Tests (x86 emulator)': 'android_gyp_debug_static_bot_x86',
+      'Android Tests (x86 emulator)': 'android_gn_debug_static_bot_x86',
       'Android Asan Builder Tests (dbg)':
-          'android_asan_gyp_debug_bot_minimal_symbols',
-      'Android Builder (dbg)': 'android_gyp_debug_static_bot',
+          'android_asan_gn_debug_bot_minimal_symbols',
+      'Android Builder (dbg)': 'android_gn_debug_static_bot',
       'CFI Linux CF': 'gn_cfi_diag_release_bot',
       'CFI Linux ToT': 'gn_cfi_release_bot',
       'CFI Linux': 'gn_cfi_release_bot',
       'Chromium Win MiniInstaller Tests': 'none',
       'Chromium Win PGO Builder': 'gyp_official_winpgo',
       'Chromium Win x64 PGO Builder': 'gyp_official_winpgo_x64',
       'Chromium Windows Analyze': 'gn_windows_analyze',
       'Chromium_iOS_Device': 'ios_gyp',
       'Chromium_iOS_Device_(ninja)': 'ios_gyp',
       'Chromium_iOS_Simulator_(dbg)': 'ios_gyp',
@@ skipping 721 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_gyp_debug_bot_minimal_symbols': [
-      'android', 'asan', 'gyp', 'debug_bot_minimal_symbols',
+    'android_asan_gn_debug_bot_minimal_symbols': [
+      'android', 'asan', 'gn', 'debug_bot_minimal_symbols',
     ],
 
     'android_cast_gyp_debug_static_bot': [
       'android', 'cast', 'gyp', 'debug_static_bot',
     ],
 
-    'android_clang_no_chrome_plugins_asan_gyp_debug_bot_minimal_symbols': [
-      'android', 'clang_no_chrome_plugins', 'asan', 'gyp',
+    'android_clang_no_chrome_plugins_asan_gn_debug_bot_minimal_symbols': [
+      'android', 'clang_no_chrome_plugins', 'asan', 'gn',
       'debug_bot_minimal_symbols',
     ],
 
     'android_clang_asan_findbugs_gyp_debug_bot_minimal_symbols': [
       'android', 'clang', 'asan', 'findbugs', 'gyp',
       'debug_bot_minimal_symbols',
     ],
 
     'android_clang_asan_findbugs_gyp_debug_trybot': [
       'android', 'clang', 'asan', 'findbugs', 'gyp', 'debug_trybot',
@@ skipping 93 matching lines @@
     ],
 
     'android_gyp_debug_static_bot': [
       'android', 'gyp', 'debug_static_bot',
     ],
 
     'android_gyp_debug_static_bot_arm64': [
       'android', 'gyp', 'debug_static_bot', 'arm64',
     ],
 
-    'android_gyp_debug_static_bot_x86': [
-      'android', 'gyp', 'debug_static_bot', 'x86',
-    ],
-
     'android_without_codecs_gyp_release_bot_minimal_symbols': [
       'android_without_codecs', 'gyp', 'release_bot_minimal_symbols',
     ],
 
     'cast_gn_release_bot': [
       'cast', 'gn', 'release_bot',
     ],
 
     'cast_gn_release_trybot': [
       'cast', 'gn', 'release_trybot',
@@ skipping 893 matching lines @@
       'gn_args': 'is_component_build=true enable_iterator_debugging=false',
       'gyp_defines': 'component=shared_library build_for_tool=drmemory',
     },
 
     'valgrind': {
       # TODO: add gn_args for 'build_for_tool=memcheck'
       'gyp_defines': 'build_for_tool=memcheck',
     }
   },
 }