[Android] Add mb_config entries for chromium.linux and tryserver.chromium.android.

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 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_cast_gyp_debug_static_bot': ['android', 'cast', 'gyp', 'debug_static_bot'],
     'android_clang_asan_gyp_debug_bot': ['android', 'clang', 'asan', 'gyp', 'debug_bot'],
+    'android_clang_asan_gyp_debug_trybot': ['android', 'clang', 'asan', 'gyp', 'debug_trybot'],
     'android_gn_debug_bot': ['android', 'chrome_with_codecs', 'gn', 'debug_bot'],
     'android_gn_debug_static_bot': ['android', 'chrome_with_codecs', 'gn', 'debug_static_bot'],
     'android_gn_debug_static_bot_arm64': ['android', 'chrome_with_codecs', 'gn', 'debug_static_bot', 'arm64'],
     'android_gn_debug_static_bot_mipsel': ['android', 'chrome_with_codecs', 'gn', 'debug_static_bot', 'mipsel'],
     'android_gn_debug_static_bot_x64': ['android', 'chrome_with_codecs', 'gn', 'debug_static_bot', 'x64'],
     'android_gn_debug_static_bot_x86': ['android', 'chrome_with_codecs', 'gn', 'debug_static_bot', 'x86'],
+    'android_gn_debug_trybot': ['android', 'chrome_with_codecs', 'gn', 'debug_trybot'],
+    'android_gn_debug_trybot_mipsel': ['android', 'chrome_with_codecs', 'gn', 'debug_trybot', 'mipsel'],
+    'android_gn_debug_trybot_x64': ['android', 'chrome_with_codecs', 'gn', 'debug_trybot', 'x64'],
+    'android_gn_debug_trybot_x86': ['android', 'chrome_with_codecs', 'gn', 'debug_trybot', 'x86'],
     'android_gn_release_bot': ['android', 'gn', 'release_bot'],
     'android_gn_release_trybot': ['android', 'gn', 'release_trybot'],
     '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_trybot': ['android', 'chrome_with_codecs', 'gyp', 'debug_trybot'],
+    'android_gyp_debug_trybot_arm64': ['android', 'chrome_with_codecs', 'gyp', 'debug_trybot', 'arm64'],
     'android_gyp_release_bot': ['android', 'gyp', 'release_bot'],
     'android_gyp_release_bot_minimal_symbols': ['android', 'gyp', 'release_bot_minimal_symbols'],
+    'android_gyp_release_trybot': ['android', 'gyp', 'release_trybot'],
     'cast_gn_release_bot': ['cast', 'gn', 'release_bot'],
     'cast_gn_release_trybot': ['cast', 'gn', 'release_trybot'],
     'chromeos_gn_debug_bot': ['chromeos', 'gn', 'debug_bot'],
     'chromeos_ozone_gn_release_bot': ['chromeos', 'ozone', 'gn', 'release_bot'],
     'chromeos_ozone_gn_release_trybot': ['chromeos', 'ozone', 'gn', 'release_trybot'],
     'dev_gn_debug': ['gn', 'debug', 'shared', 'full_symbols'],
     'dev_gn_release': ['gn', 'release', 'shared'],
     'dev_gyp_debug': ['gyp', 'debug', 'shared', 'full_symbols'],
     'dev_gyp_release': ['gyp', 'release', 'shared'],
     'embedded_gyp_debug_bot': ['embedded', 'gyp', 'debug_bot'],
@@ skipping 475 matching lines @@
       'Google Chrome Linux': 'gyp_official_goma_x86',
       'Google Chrome Linux x64': 'gn_official_goma',
       'Google Chrome Mac': 'gyp_official_goma',
       'Google Chrome ChromeOS': 'gyp_official_goma_chromeos',
     },
     'chromium.chromiumos': {
       'Linux ChromiumOS GN': 'chromeos_ozone_gn_release_bot',
       'Linux ChromiumOS GN (dbg)': 'chromeos_gn_debug_bot',
     },
     'chromium.linux': {
-      'Linux Builder': 'swarming_gn_release_bot',
-      'Linux Tests': 'none',
-      'Linux Builder (dbg)(32)': 'swarming_gyp_debug_bot_no_symbols_x86',
-      'Linux Tests (dbg)(1)(32)': 'none',
-      'Linux Builder (dbg)': 'swarming_gn_debug_bot',
-      'Linux Tests (dbg)(1)': 'none',
-      'Linux GN': 'gn_release_bot',
-      'Linux GN Clobber': 'gn_release_bot',
-      'Linux GN (dbg)': 'gn_debug_bot',
-      'Cast Linux': 'cast_gn_release_bot',
       'Android Arm64 Builder (dbg)': 'android_gyp_debug_static_bot_arm64',
+      'Android Builder': 'android_gyp_release_bot',
       'Android Builder (dbg)': 'android_gyp_debug_static_bot',
-      'Android Tests (dbg)': 'android_gyp_debug_static_bot',
-      'Android Builder': 'android_gyp_release_bot',
-      'Android Tests': 'android_gyp_release_bot',
       'Android Clang Builder (dbg)': 'android_clang_asan_gyp_debug_bot',
       'Android GN': 'android_gn_release_bot',
       'Android GN (dbg)': 'android_gn_debug_bot',
+      'Android Tests': 'android_gyp_release_bot',
+      'Android Tests (dbg)': 'android_gyp_debug_static_bot',
       'Cast Android (dbg)': 'android_cast_gyp_debug_static_bot',
+      'Cast Linux': 'cast_gn_release_bot',
+      'Linux Builder': 'swarming_gn_release_bot',
+      'Linux Builder (dbg)': 'swarming_gn_debug_bot',
+      'Linux Builder (dbg)(32)': 'swarming_gyp_debug_bot_no_symbols_x86',
+      'Linux GN': 'gn_release_bot',
+      'Linux GN (dbg)': 'gn_debug_bot',
+      'Linux GN Clobber': 'gn_release_bot',
+      'Linux Tests': 'none',
+      'Linux Tests (dbg)(1)': 'none',
+      'Linux Tests (dbg)(1)(32)': 'none',

[Dirk Pranke, 2016/03/08 23:01:30]

At one point in time these were intentionally un-sorted. Instead they were
listed in the order that they appear on /builders on the buildbot waterfall. My
thinking was that it made it slightly easier to manually scan the list to make
sure we had every builder.

In retrospect it's probably lower maintenance to sort the lists like you've done
and check that they match other ways (ideally programmatically).

[jbudorick, 2016/03/08 23:46:04]

Alphabetically makes it easier to check for any one builder. I can see how
bot-order would make it easier to scan for entire sections of the waterfall,
though.

Any thoughts about how would we go about enforcing these lists programmatically
short of somehow comparing them against the relevant master.cfg?

     },
     'chromium.mac': {
       'Mac GN': 'gn_release_bot',
       'Mac GN (dbg)': 'gn_debug_static_bot',
     },
     'chromium.mojo': {
       'Chromium Mojo Android': 'android_gn_release_bot',
       'Chromium Mojo Windows': 'gn_release_bot_minimal_symbols_x86',
       'Chromium Mojo Linux': 'gn_release_bot',
     },
@@ skipping 168 matching lines @@
       'mac_blink_oilpan_dbg': 'swarming_gyp_non_oilpan_debug_bot_minimal_symbols_x64',
       'mac_blink_oilpan_rel': 'swarming_gyp_non_oilpan_release_trybot_minimal_symbols_x64',
       'mac_blink_oilpan_compile_rel': 'swarming_gyp_non_oilpan_release_trybot_minimal_symbols_x64',
       'win_blink_oilpan_dbg': 'swarming_gyp_non_oilpan_debug_bot_minimal_symbols_x86',
       'win_blink_oilpan_rel': 'swarming_gyp_non_oilpan_release_trybot_minimal_symbols_x86',
       'win_blink_oilpan_compile_rel': 'swarming_gyp_non_oilpan_release_trybot_minimal_symbols_x86',
       'linux_blink_rel_ng': 'swarming_gn_release_trybot_minimal_symbols_x64',
       'blink_presubmit': 'none',
     },
     'tryserver.chromium.android': {
-      'android_chromium_gn_compile_dbg': 'android_gn_debug_bot',
+      'android_arm64_dbg_recipe': 'android_gyp_debug_trybot_arm64',
+      'android_chromium_gn_compile_dbg': 'android_gn_debug_trybot',
       'android_chromium_gn_compile_rel': 'android_gn_release_trybot',
       'android_chromium_gn_rel': 'android_gn_release_trybot',
-      'android_compile_mips_dbg': 'android_gn_debug_static_bot_mipsel',
-      'android_compile_x64_dbg': 'android_gn_debug_static_bot_x64',
-      'android_compile_x86_dbg': 'android_gn_debug_static_bot_x86',
+      'android_clang_dbg_recipe': 'android_clang_asan_gyp_debug_trybot',
+      'android_compile_dbg': 'android_gyp_debug_trybot',
+      'android_compile_mips_dbg': 'android_gn_debug_trybot_mipsel',
+      'android_compile_rel': 'android_gyp_release_trybot',
+      'android_compile_x64_dbg': 'android_gn_debug_trybot_x64',
+      'android_compile_x86_dbg': 'android_gn_debug_trybot_x86',
+      'linux_android_dbg_ng': 'android_gyp_debug_trybot',
+      'linux_android_rel_ng': 'android_gyp_release_trybot',
     },
     'tryserver.chromium.angle': {
       'linux_angle_rel_ng': 'swarming_gpu_fyi_tests_gn_release_trybot',
       'linux_angle_dbg_ng': 'swarming_gpu_fyi_tests_gn_debug_trybot',
     },
     'tryserver.chromium.linux': {
       'linux_chromium_asan_rel_ng': 'swarming_asan_lsan_gyp_release_trybot',
       'linux_full_bisect_builder': 'swarming_gyp_release_bot',
       'linux_site_isolation': 'gn_release_trybot',
       'linux_valgrind': 'gyp_valgrind_release_bot',
@@ skipping 75 matching lines @@
       'win_chromium_clang_upload': 'gn_release_bot',
       'win_clang_x64_dbg': 'win_clang_debug_bot',
     },
     'tryserver.v8': {
       'v8_linux_chromium_gn_rel': 'gn_release_trybot',
       'v8_android_chromium_gn_dbg': 'android_gn_debug_bot',
       'v8_linux_blink_rel': 'swarming_gn_release_trybot_minimal_symbols_x64',
     },
   },
 }