Add an Android CFI bot on chromium.memory (src).

This bot has the same configuration as ToTAndroidCFI except that it
uses clang releases instead of clang ToT.

While here, drop an unnecessary test suite exception from the
configuration for ToTAndroidCFI.

Bug: 810907
Change-Id: I9040dd8ba64b9117fd6c1425ca60b88a6161bc2b
Reviewed-on: https://chromium-review.googlesource.com/924607
Commit-Queue: Peter Collingbourne <pcc@chromium.org>
Reviewed-by: John Budorick <jbudorick@chromium.org>
Cr-Commit-Position: refs/heads/master@{#538877}

testing/buildbot/test_suite_exceptions.pyl

@@ -524,6 +524,7 @@
       # chromium.fyi
       'ThinLTO Linux ToT',
       # chromium.memory
+      'Android CFI',
       'Mac ASan 64 Tests (1)',
     ],
   },
@@ -597,6 +598,8 @@
       'Marshmallow Phone Tester (rel)',
       # chromium.clang
       'ToTAndroidCFI',
+      # chromium.memory
+      'Android CFI',
       # TODO(dpranke): on chromium.swarm, this is probably also an accident.
       'Android N5X Swarm',
     ],
@@ -825,6 +828,12 @@
           'hard_timeout': 0,
         },
       },
+      # chromium.memory
+      'Android CFI': {
+        'swarming': {
+          'hard_timeout': 0,
+        },
+      },
     },
   },
   'chromedriver_unittests': {
@@ -1293,6 +1302,13 @@
           'shards': 1,
         },
       },
+      # chromium.memory
+      'Android CFI': {
+        'swarming': {
+          'hard_timeout': 0,
+          'shards': 1,
+        },
+      },
     },
   },
   'content_unittests': {
@@ -1754,16 +1770,6 @@
         },
         'use_xvfb': False,
       },
-      'ToTAndroidCFI': {
-        'swarming': {
-          'dimension_sets': [
-            {
-              'device_os': 'MMB29Q',
-              'device_type': 'bullhead',
-            },
-          ],
-        },
-      },
       # chromium.memory
       'Linux CFI': {
         'args': [
@@ -2066,6 +2072,8 @@
       'x86 Cloud Tester',
       # chromium.clang
       'ToTAndroidCFI',
+      # chromium.memory
+      'Android CFI',
     ],
   },
   'keyboard_unittests': {
@@ -2289,6 +2297,8 @@
       'x86 Cloud Tester',
       # chromium.clang
       'ToTAndroidCFI',
+      # chromium.memory
+      'Android CFI',
     ],
   },
   'mojo_common_unittests': {
@@ -2418,6 +2428,12 @@
           'hard_timeout': 0,
         },
       },
+      # chromium.clang
+      'Android CFI': {
+        'swarming': {
+          'hard_timeout': 0,
+        },
+      },
     },
   },
   'nacl_helper_nonsfi_unittests': {
@@ -2624,6 +2640,8 @@
       'Linux Tests (dbg)(1)(32)',
       # chromium.clang
       'ToTAndroidCFI',
+      # chromium.memory
+      'Android CFI',
     ],
   },
   'renderer_side_navigation_content_browsertests': {

testing/buildbot/waterfalls.pyl

@@ -1640,6 +1640,19 @@
   {
     'name': 'chromium.memory',
     'machines': {
+      'Android CFI': {
+        'swarming': {
+          'dimension_sets': [
+            {
+              'device_os': 'MMB29Q',
+              'device_type': 'bullhead',
+            },
+          ],
+        },
+        'test_suites': {
+          'gtest_tests': 'chromium_android_clang_and_gl_gtests',
+        },
+      },
       'Linux ASan LSan Tests (1)': {
         'test_suites': {
           'gtest_tests': 'chromium_memory_linux_asan_gtests',

tools/mb/mb_config.pyl

@@ -378,6 +378,7 @@
     },
 
     'chromium.memory': {
+      'Android CFI': 'android_cfi_full_cfi_diag_thin_lto_release_static_dcheck_always_on_goma',
       'Linux ASan LSan Builder': 'asan_lsan_release_trybot',
       'Linux CFI': 'cfi_full_cfi_diag_thin_lto_release_static_dcheck_always_on_goma',
       'Linux Chromium OS ASan LSan Builder': 'asan_lsan_chromeos_release_trybot',
@@ -539,6 +540,7 @@
       'android_archive_rel_ng': 'android_release_trybot',
       'android_arm64_dbg_recipe': 'android_debug_trybot_compile_only_arm64',
       'android_blink_rel': 'android_release_trybot',
+      'android_cfi_rel_ng': 'android_cfi_full_cfi_diag_thin_lto_release_static_dcheck_always_on_goma',
       'android_clang_dbg_recipe': 'android_clang_asan_debug_trybot_compile_only',
       'android_compile_dbg': 'android_debug_trybot_compile_only',
       'android_compile_mips_dbg': 'android_debug_trybot_compile_only_mipsel',
@@ -774,6 +776,10 @@
       'android', 'cast', 'clang', 'debug_static_bot', 'compile_only',
     ],
 
+    'android_cfi_full_cfi_diag_thin_lto_release_static_dcheck_always_on_goma': [
+      'android', 'cfi_full', 'cfi_diag', 'thin_lto', 'release', 'static', 'dcheck_always_on', 'goma',
+    ],
+
     'android_clang_asan_debug_bot_minimal_symbols': [
       'android', 'clang', 'asan', 'debug_bot', 'minimal_symbols',
       'strip_debug_info',