Enable angle_deqp_gles2_tests on Nexus 5X.

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': {
     'chromeos.chrome': {
@@ skipping 278 matching lines @@
       'Mac 10.10 Release (Intel)': 'none',
       'Mac 10.10 Retina Debug (AMD)': 'none',
       'Mac 10.10 Retina Release (AMD)': 'none',
       'Win7 Debug (NVIDIA)': 'none',
       'Win7 Release (NVIDIA)': 'none',
     },
 
     'chromium.gpu.fyi': {
       # These all use the 'trybot' mixins to ensure that dcheck is on.
       'Android Release (Nexus 5)': 'android_gn_release_trybot',
-      'Android Release (Nexus 5X)': 'swarming_android_gn_release_trybot_arm64',
+      'Android Release (Nexus 5X)': 'swarming_gpu_tests_deqp_android_gn_release_trybot_arm64',
       'Android Release (Nexus 6)': 'android_gn_release_trybot',
       'Android Release (Nexus 6P)': 'android_gn_release_trybot_arm64',
       'Android Release (Nexus 9)': 'android_gn_release_trybot_arm64',
       'Android Release (Pixel C)': 'android_gn_release_trybot_arm64',
       'GPU Linux Builder (dbg)': 'swarming_gpu_fyi_tests_gn_debug_trybot',
       'GPU Linux Builder': 'swarming_gpu_fyi_tests_gn_release_trybot',
       'GPU Mac Builder': 'swarming_gpu_fyi_tests_gn_release_trybot',
       'GPU Mac Builder (dbg)': 'swarming_gpu_fyi_tests_gn_debug_trybot',
       'GPU Win Builder': 'swarming_gpu_tests_deqp_gles_gn_release_trybot_x86',
       'GPU Win Builder (dbg)':
@@ skipping 485 matching lines @@
       'android_compile_rel': 'swarming_android_gn_release_trybot',
       'android_compile_x64_dbg': 'android_gn_debug_trybot_x64',
       'android_compile_x86_dbg': 'android_gn_debug_trybot_x86',
       'android_coverage': 'android_gn_debug_trybot_java_coverage',
       'android_cronet': 'android_cronet_gn_release_trybot_arm_no_neon',
       # TODO(crbug/597596): Switch this back to debug_trybot when cronet's
       # shared library loading is fixed.
       'android_cronet_tester': 'android_cronet_gn_debug_static_bot_arm_no_neon',
       'android_n5x_swarming_rel': 'swarming_android_gn_release_trybot_arm64',
       'android_optional_gpu_tests_rel':
-        'swarming_android_gn_release_trybot_arm64',
+        'swarming_gpu_tests_deqp_android_gn_release_trybot_arm64',
       'cast_shell_android': 'android_cast_gn_debug_static_bot',
       'linux_android_dbg_ng': 'swarming_android_gn_debug_trybot',
       'linux_android_rel_ng': 'swarming_android_gn_release_trybot',
     },
 
     'tryserver.chromium.angle': {
       'android_angle_rel_ng':
-        'swarming_gpu_tests_android_gn_release_trybot',
+        'swarming_gpu_tests_deqp_android_gn_release_trybot_arm64',
       'linux_angle_chromeos_rel_ng':
         'swarming_gpu_fyi_tests_chromeos_gn_release_trybot',
       'linux_angle_dbg_ng': 'swarming_gpu_fyi_tests_gn_debug_trybot',
       'linux_angle_rel_ng': 'swarming_gpu_fyi_tests_gn_release_trybot',
       'mac_angle_dbg_ng': 'swarming_gpu_fyi_tests_gn_debug_trybot',
       'mac_angle_rel_ng': 'swarming_gpu_fyi_tests_gn_release_trybot',
       'win_angle_dbg_ng': 'swarming_gpu_tests_deqp_gles_gn_debug_trybot_x86',
       'win_angle_rel_ng': 'swarming_gpu_tests_deqp_gles_gn_release_trybot_x86',
       'win_angle_x64_dbg_ng':
         'swarming_gpu_tests_deqp_gles_gn_debug_trybot_x64',
@@ skipping 965 matching lines @@
     ],
 
     'swarming_gyp_release_trybot': [
       'swarming', 'gyp', 'release_trybot',
     ],
 
     'swarming_gyp_release_trybot_x86': [
       'swarming', 'gyp', 'release_trybot', 'x86',
     ],
 
-    'swarming_gpu_tests_android_gn_release_trybot': [
-      'swarming', 'gpu_tests', 'android', 'gn', 'release_trybot',
-    ],
-
     'swarming_gpu_fyi_tests_chromeos_gn_release_trybot': [
       'swarming_gpu_fyi_tests_gn', 'release_trybot', 'chromeos',
     ],
 
     'swarming_gpu_fyi_tests_gn_debug_trybot': [
       'swarming_gpu_fyi_tests_gn', 'debug_trybot',
     ],
 
     'swarming_gpu_fyi_tests_gn_release_trybot': [
       'swarming_gpu_fyi_tests_gn', 'release_trybot',
     ],
 
     'swarming_gpu_fyi_tests_gn_release_trybot_asan': [
       'swarming_gpu_fyi_tests_gn', 'release_trybot',
       'asan', 'full_symbols', 'disable_nacl',
     ],
 
     'swarming_gpu_fyi_tests_win_clang_debug_bot': [
       'swarming', 'gpu_tests', 'internal_gles2_conform_tests',
       'gn', 'clang', 'debug_bot_minimal_symbols',
     ],
 
+    'swarming_gpu_tests_deqp_android_gn_release_trybot_arm64': [
+      'swarming', 'gpu_tests', 'angle_deqp_tests', 'android', 'gn',
+      'release_trybot', 'arm64',
+    ],
+
     'swarming_gpu_tests_deqp_gles_gn_debug_trybot_x64': [
       'swarming_gpu_fyi_tests_gn', 'debug_trybot', 'x64',
     ],
 
     'swarming_gpu_tests_deqp_gles_gn_debug_trybot_x86': [
       'swarming_gpu_fyi_tests_gn', 'debug_trybot', 'x86',
     ],
 
     'swarming_gpu_tests_deqp_gles_gn_release_trybot_x64': [
       'swarming_gpu_fyi_tests_gn', 'release_trybot', 'x64',
@@ skipping 665 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',
     },
   },
 }