MB: Update Android bots after moving to Swarming and client.webrtc.perf

webrtc/build/mb_config.pyl

 # Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
 #
 # Use of this source code is governed by a BSD-style license
 # that can be found in the LICENSE file in the root of the source
 # tree. An additional intellectual property rights grant can be found
 # in the file PATENTS.  All contributing project authors may
 # be found in the AUTHORS file in the root of the source tree.
 
 # FOR DETAILS ON THIS FILE SEE THE MAIN COPY IN //tools/mb/mb_config.pyl.
 # This is configuration for standalone WebRTC bots. It is used to keep the bot
@@ skipping 36 matching lines @@
       'Linux Memcheck': 'gn_memcheck_release_bot_x64',
       'Linux MSan': 'gn_msan_clang_release_bot_x64',
       'Linux Tsan v2': 'gn_tsan_clang_release_bot_x64',
       'Linux UBSan': 'gn_ubsan_clang_release_bot_x64',
       'Linux UBSan vptr': 'gn_ubsan_vptr_clang_release_bot_x64',
       'Linux64 Release [large tests]': 'gn_release_bot_x64',
       'Linux64 Debug (GYP)': 'gyp_debug_bot_x64_exclude_tests',
       'Linux64 Release (GYP)': 'gyp_release_bot_x64_exclude_tests',
 
       # Android
-      'Android32 Builder': 'android_gn_release_bot_arm',
-      'Android32 Builder (dbg)': 'android_gn_debug_static_bot_arm',
+      'Android32 (M Nexus5X)': 'android_gn_release_bot_arm',
+      'Android32 (M Nexus5X)(dbg)': 'android_gn_debug_static_bot_arm',
+      'Android64 (M Nexus5X)': 'android_gn_release_bot_arm64',
+      'Android64 (M Nexus5X)(dbg)': 'android_gn_debug_static_bot_arm64',
       'Android32 Builder x86': 'android_gn_release_bot_x86',
       'Android32 Builder x86 (dbg)': 'android_gn_debug_static_bot_x86',
+      'Android64 Builder x64 (dbg)': 'android_gn_debug_static_bot_x64',
       'Android32 Builder MIPS (dbg)': 'android_gn_clang_debug_static_bot_mipsel',
       'Android32 Clang (dbg)': 'android_gn_clang_debug_bot_arm',
-      'Android64 Builder': 'android_gn_release_bot_arm64',
-      'Android64 Builder (dbg)': 'android_gn_debug_static_bot_arm64',
-      'Android64 Builder x64 (dbg)': 'android_gn_debug_static_bot_x64',
       'Android32 GYP': 'android_gyp_release_bot_arm',
       'Android32 GYP (dbg)': 'android_gyp_debug_static_bot_arm',
-      'Android32 Tests (L Nexus5)(dbg)': 'none',
-      'Android32 Tests (L Nexus5)': 'none',
-      'Android32 Tests (L Nexus7.2)(dbg)': 'none',
-      'Android32 Tests (L Nexus7.2)': 'none',
-      'Android64 Tests (L Nexus9)': 'none',
 
       # Windows
       'Win32 Debug': 'gn_debug_bot_x86',
       'Win32 Release': 'gn_release_bot_x86',
       'Win64 Debug': 'gn_debug_bot_x64',
       'Win64 Release': 'gn_release_bot_x64',
       'Win32 Debug (Clang)': 'win_gn_clang_debug_bot_x86',
       'Win32 Release (Clang)': 'win_gn_clang_release_bot_x86',
       'Win64 Debug (Clang)': 'win_gn_clang_debug_bot_x64',
       'Win64 Release (Clang)': 'win_gn_clang_release_bot_x64',
       'Win SyzyASan': 'win_gn_syzyasan_release_bot_x86',
       'Win DrMemory Full': 'win_gn_drmemory_debug_bot_x86',
       'Win DrMemory Light': 'win_gn_drmemory_debug_bot_x86',
       'Win32 Release [large tests]': 'gn_release_bot_x86',
       'Win64 Debug (GYP)': 'gyp_debug_bot_x64_exclude_tests',
       'Win64 Release (GYP)': 'gyp_release_bot_x64_exclude_tests',
     },
+    'client.webrtc.perf': {
+      # Android
+      'Android32 Builder': 'android_gn_release_bot_arm',
+      'Android64 Builder': 'android_gn_release_bot_arm64',
+      'Android32 Tests (L Nexus5)': 'none',
+      'Android32 Tests (L Nexus7.2)': 'none',
+      'Android64 Tests (L Nexus9)': 'none',
+    },
+    'client.webrtc.fyi': {
+      # Mac
+      'Mac64 Release (swarming)': 'swarming_gn_release_bot_x64',
+
+      # Linux
+      'Linux64 GCC': 'gn_gcc_release_bot_x64',
+      'Linux64 Release (swarming)': 'swarming_gn_release_bot_x64',
+
+      # Android
+      'Android32 Release (swarming)': 'swarming_android_gn_release_bot_arm',
+      'Android32 ASan (L Nexus6)': 'android_gn_asan_shared_release_bot_arm',
+      'Android32 Builder': 'android_gn_release_bot_arm',
+      'Android32 Tests (J Nexus4)': 'none',
+      'Android32 Tests (K Nexus5)': 'none',
+      'Android32 Tests (L Nexus6)': 'none',
+
+      # Windows
+      'Win32 Release (swarming)': 'swarming_gn_release_bot_x86',
+    },
     'tryserver.webrtc': {
       # iOS
       'ios_dbg': 'ios_gn_debug_static_bot_arm_device',
       'ios_rel': 'ios_gn_release_bot_arm_device',
       'ios_arm64_dbg': 'ios_gn_debug_static_bot_arm64_device',
       'ios_arm64_rel': 'ios_gn_release_bot_arm64_device',
       'ios32_sim_dbg': 'ios_gn_debug_static_bot_x86',
       'ios64_sim_dbg': 'ios_gn_debug_static_bot_x64',
       'ios64_gyp_dbg': 'ios_gyp_debug_static_bot_arm64_device',
       'ios64_gyp_rel': 'ios_gyp_release_bot_arm64_device',
@@ skipping 59 matching lines @@
       'win_clang_rel': 'win_gn_clang_release_bot_x86',
       'win_x64_clang_dbg': 'win_gn_clang_debug_bot_x64',
       'win_x64_clang_rel': 'win_gn_clang_release_bot_x64',
       'win_asan': 'win_gn_syzyasan_release_bot_x86',
       'win_drmemory_light': 'win_gn_drmemory_debug_bot_x86',
       'win_drmemory_full': 'win_gn_drmemory_debug_bot_x86',
       'win_baremetal': 'gn_release_bot_x86',
       'win_swarming': 'swarming_gn_debug_bot_x64',
       'win_x64_gyp_dbg': 'gyp_debug_bot_x64_exclude_tests',
       'win_x64_gyp_rel': 'gyp_release_bot_x64_exclude_tests',
-    },
-    'client.webrtc.fyi': {
-      # Mac
-      'Mac64 Release (swarming)': 'swarming_gn_release_bot_x64',
-
-      # Linux
-      'Linux64 GCC': 'gn_gcc_release_bot_x64',
-      'Linux64 Release (swarming)': 'swarming_gn_release_bot_x64',
-
-      # Android
-      'Android32 Release (swarming)': 'swarming_android_gn_release_bot_arm',
-      'Android32 ASan (L Nexus6)': 'android_gn_asan_shared_release_bot_arm',
-      'Android32 Builder': 'android_gn_release_bot_arm',
-      'Android32 Tests (J Nexus4)': 'none',
-      'Android32 Tests (K Nexus5)': 'none',
-      'Android32 Tests (L Nexus6)': 'none',
-
-      # Windows
-      'Win32 Release (swarming)': 'swarming_gn_release_bot_x86',
     }
   },
 
   # 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': {
     # iOS
@@ skipping 346 matching lines @@
       'gn_args': 'target_cpu="x64"',
       'gyp_defines': 'target_arch=x64',
     },
 
     'x86': {
       'gn_args': 'target_cpu="x86"',
       'gyp_defines': 'target_arch=ia32',
     },
   },
 }