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

tools/mb/mb_config.pyl

Index: tools/mb/mb_config.pyl
diff --git a/tools/mb/mb_config.pyl b/tools/mb/mb_config.pyl
index 7f462d04501838b9c20029480870054f1897aec1..615171955625f5779e3c7edf695f3e6cf5b61255 100644
--- a/tools/mb/mb_config.pyl
+++ b/tools/mb/mb_config.pyl
@@ -11,18 +11,26 @@
   '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'],
@@ -518,25 +526,25 @@
       '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 (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 Builder (dbg)': 'android_gyp_debug_static_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',
@@ -725,12 +733,18 @@
       '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',