[Android] Switch the x86, x64, and mips builders on chromium.android to mb.

scripts/slave/recipe_modules/chromium_tests/chromium_android.py

Index: scripts/slave/recipe_modules/chromium_tests/chromium_android.py
diff --git a/scripts/slave/recipe_modules/chromium_tests/chromium_android.py b/scripts/slave/recipe_modules/chromium_tests/chromium_android.py
index 1d726b5f0b8c9aa3fc6cb0432fda5c62eb708d72..1731a0b8dbdf0d0415a6936bf5e4690041fdb3b1 100644
--- a/scripts/slave/recipe_modules/chromium_tests/chromium_android.py
+++ b/scripts/slave/recipe_modules/chromium_tests/chromium_android.py
@@ -20,10 +20,6 @@ SPEC = {
         'TARGET_PLATFORM': 'android',
       },
       'android_config': 'main_builder_mb',
-      'compile_targets': [
-        'android_builder_tests',
-        'remoting_apk',
-      ],
       'bot_type': 'builder',
       'testing': {
         'platform': 'linux',
@@ -40,9 +36,54 @@ SPEC = {
         'TARGET_PLATFORM': 'android',
       },
       'android_config': 'main_builder_mb',
-      'compile_targets': [
-        'android_builder_tests'
-      ],
+      'bot_type': 'builder',
+      'testing': {
+        'platform': 'linux',
+      },
+    },
+
+    'Android MIPS Builder (dbg)': {
+      'chromium_config': 'android',
+      'gclient_config': 'chromium',
+      'gclient_apply_config': ['android'],
+      'chromium_config_kwargs': {
+        'BUILD_CONFIG': 'Debug',
+        'TARGET_BITS': 64,
+        'TARGET_PLATFORM': 'android',
+      },
+      'android_config': 'mipsel_builder_mb',
+      'bot_type': 'builder',
+      'testing': {
+        'platform': 'linux',
+      },
+    },
+
+    'Android x64 Builder (dbg)': {
+      'chromium_config': 'android',
+      'gclient_config': 'chromium',
+      'gclient_apply_config': ['android'],
+      'chromium_config_kwargs': {
+        'BUILD_CONFIG': 'Debug',
+        'TARGET_BITS': 64,
+        'TARGET_PLATFORM': 'android',
+      },
+      'android_config': 'x64_builder_mb',
+      'bot_type': 'builder',
+      'testing': {
+        'platform': 'linux',
+      },
+    },
+
+    'Android x86 Builder (dbg)': {
+      'chromium_config': 'android',
+      'gclient_config': 'chromium',
+      'gclient_apply_config': ['android'],
+      'chromium_config_kwargs': {
+        'BUILD_CONFIG': 'Debug',
+        'TARGET_BITS': 64,
+        'TARGET_PLATFORM': 'android',
+      },
+      'android_config': 'x86_builder_mb',
       'bot_type': 'builder',
       'testing': {
         'platform': 'linux',
@@ -262,81 +303,5 @@ SPEC = {
         steps.generate_isolated_script,
       ],
     },
-
-    'Android WebView (amp)': {
-      'chromium_config': 'android',
-      'gclient_config': 'chromium',
-      'gclient_apply_config': ['android'],
-      'amp_config': 'main_pool',
-      'chromium_config_kwargs': {
-        'BUILD_CONFIG': 'Release',
-        'TARGET_BITS': 32,
-        'TARGET_PLATFORM': 'android',
-      },
-      'parent_buildername': 'Android arm Builder (dbg)',
-      'bot_type': 'tester',
-      'android_config': 'main_builder_mb',
-      'enable_swarming': False,
-      'tests': [
-        steps.AMPInstrumentationTest(
-            test_apk='AndroidWebViewTest',
-            apk_under_test='AndroidWebView',
-            android_isolate_path=
-                'android_webview/android_webview_test_apk.isolate',
-            compile_target='android_webview_test_apk',
-            device_name=['Nexus 7'], device_os=['4.4.2'],
-            fallback_to_local=False,
-            test_run_timeout=3600,
-            test_timeout_scale=5),
-        steps.AMPInstrumentationTest(
-            test_apk='AndroidWebViewTest',
-            apk_under_test='AndroidWebView',
-            android_isolate_path=
-                'android_webview/android_webview_test_apk.isolate',
-            compile_target='android_webview_test_apk',
-            device_name=['Galaxy S4'], device_os=['4.4.2'],
-            fallback_to_local=False,
-            test_run_timeout=3600,
-            test_timeout_scale=5),
-        steps.AMPInstrumentationTest(
-            test_apk='AndroidWebViewTest',
-            apk_under_test='AndroidWebView',
-            android_isolate_path=
-                'android_webview/android_webview_test_apk.isolate',
-            compile_target='android_webview_test_apk',
-            device_name=['Galaxy Note 3'], device_os=['4.4.2'],
-            fallback_to_local=False,
-            test_run_timeout=3600,
-            test_timeout_scale=5),
-        steps.AMPInstrumentationTest(
-            test_apk='AndroidWebViewTest',
-            apk_under_test='AndroidWebView',
-            android_isolate_path=
-                'android_webview/android_webview_test_apk.isolate',
-            compile_target='android_webview_test_apk',
-            device_name=['Moto G'], device_os=['4.4.2'],
-            fallback_to_local=False,
-            test_run_timeout=3600,
-            test_timeout_scale=5),
-        steps.AMPInstrumentationTest(
-            test_apk='AndroidWebViewTest',
-            apk_under_test='AndroidWebView',
-            android_isolate_path=
-                'android_webview/android_webview_test_apk.isolate',
-            compile_target='android_webview_test_apk',
-            device_name=['One M8'], device_os=['4.4.2'],
-            fallback_to_local=False,
-            test_run_timeout=3600,
-            test_timeout_scale=5),
-      ],
-      'test_generators': [
-        steps.generate_gtest,
-        steps.generate_script,
-        steps.generate_isolated_script,
-      ],
-      'testing': {
-        'platform': 'linux',
-      },
-    },
   },
 }