Revert of WebRTC: Add android_junit_tests.

scripts/slave/recipe_modules/webrtc/builders.py

 # Copyright 2014 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.
 
 # Contains the bulk of the WebRTC builder configurations so they can be reused
 # from multiple recipes.
 
 from recipe_engine.types import freeze
 
 RECIPE_CONFIGS = freeze({
@@ skipping 14 matching lines @@
   'webrtc_clang': {
     'chromium_config': 'webrtc_clang',
     'gclient_config': 'webrtc',
     'test_suite': 'webrtc',
   },
   'webrtc_android': {
     'chromium_config': 'android',
     'chromium_android_config': 'webrtc',
     'gclient_config': 'webrtc',
     'gclient_apply_config': ['android'],
-    'test_suite': 'android_device',
+    'test_suite': 'android',
   },
   'webrtc_android_clang': {
     'chromium_config': 'android_clang',
     'chromium_android_config': 'webrtc',
     'gclient_config': 'webrtc',
     'gclient_apply_config': ['android'],
   },
   'webrtc_android_asan': {
     'chromium_config': 'android_asan',
     'chromium_android_config': 'webrtc',
     'gclient_config': 'webrtc',
     'gclient_apply_config': ['android'],
-    'test_suite': 'android_device',
-  },
-  'webrtc_android_linux': {
-    'chromium_config': 'android',
-    'chromium_android_config': 'webrtc',
-    'gclient_config': 'webrtc',
-    'gclient_apply_config': ['android'],
-    'test_suite': 'android_linux',
-  },
-  'webrtc_android_swarming': {
-    'chromium_config': 'android',
-    'chromium_android_config': 'webrtc',
-    'gclient_config': 'webrtc',
-    'gclient_apply_config': ['android'],
-    'test_suite': 'android_swarming',
+    'test_suite': 'android',
   },
 })
 
 WEBRTC_REVISION_PERF_CONFIG = '{\'a_default_rev\': \'r_webrtc_rev\'}'
 
 BUILDERS = freeze({
   'client.webrtc': {
     'settings': {
       'build_gs_bucket': 'chromium-webrtc',
       'PERF_CONFIG': WEBRTC_REVISION_PERF_CONFIG,
@@ skipping 322 matching lines @@
           'BUILD_CONFIG': 'Release',
           'TARGET_BITS': 64,
         },
         'webrtc_config_kwargs': {
           'PERF_ID': 'webrtc-linux-large-tests',
         },
         'bot_type': 'builder_tester',
         'testing': {'platform': 'linux'},
       },
       'Android32 Builder': {
-        'recipe_config': 'webrtc_android_linux',
+        'recipe_config': 'webrtc_android',
         'chromium_config_kwargs': {
           'BUILD_CONFIG': 'Release',
           'TARGET_PLATFORM': 'android',
           'TARGET_ARCH': 'arm',
           'TARGET_BITS': 32,
         },
-        'bot_type': 'builder_tester',
+        'bot_type': 'builder',
         'testing': {'platform': 'linux'},
         'triggers': [
           'Android32 Tests (L Nexus5)',
           'Android32 Tests (L Nexus7.2)',
         ],
         'archive_apprtc': True,
       },
       'Android32 Builder (dbg)': {
-        'recipe_config': 'webrtc_android_linux',
+        'recipe_config': 'webrtc_android',
         'chromium_config_kwargs': {
           'BUILD_CONFIG': 'Debug',
           'TARGET_PLATFORM': 'android',
           'TARGET_ARCH': 'arm',
           'TARGET_BITS': 32,
         },
-        'bot_type': 'builder_tester',
+        'bot_type': 'builder',
         'testing': {'platform': 'linux'},
         'triggers': [
           'Android32 Tests (L Nexus5)(dbg)',
           'Android32 Tests (L Nexus7.2)(dbg)',
         ],
         'archive_apprtc': True,
       },
       'Android32 Builder x86': {
         'recipe_config': 'webrtc_android',
         'chromium_config_kwargs': {
@@ skipping 21 matching lines @@
         'chromium_config_kwargs': {
           'BUILD_CONFIG': 'Debug',
           'TARGET_PLATFORM': 'android',
           'TARGET_ARCH': 'mipsel',
           'TARGET_BITS': 32,
         },
         'bot_type': 'builder',
         'testing': {'platform': 'linux'},
       },
       'Android64 Builder': {
-        'recipe_config': 'webrtc_android_linux',
+        'recipe_config': 'webrtc_android',
         'chromium_config_kwargs': {
           'BUILD_CONFIG': 'Release',
           'TARGET_PLATFORM': 'android',
           'TARGET_ARCH': 'arm',
           'TARGET_BITS': 64,
         },
-        'bot_type': 'builder_tester',
+        'bot_type': 'builder',
         'testing': {'platform': 'linux'},
         'triggers': [
           'Android64 Tests (L Nexus9)',
         ],
         'archive_apprtc': True,
       },
       'Android64 Builder (dbg)': {
-        'recipe_config': 'webrtc_android_linux',
+        'recipe_config': 'webrtc_android',
         'chromium_config_kwargs': {
           'BUILD_CONFIG': 'Debug',
           'TARGET_PLATFORM': 'android',
           'TARGET_ARCH': 'arm',
           'TARGET_BITS': 64,
         },
-        'bot_type': 'builder_tester',
+        'bot_type': 'builder',
         'testing': {'platform': 'linux'},
         'archive_apprtc': True,
       },
       'Android64 Builder x64 (dbg)': {
         'recipe_config': 'webrtc_android',
         'chromium_config_kwargs': {
           'BUILD_CONFIG': 'Debug',
           'TARGET_PLATFORM': 'android',
           'TARGET_ARCH': 'intel',
           'TARGET_BITS': 64,
@@ skipping 146 matching lines @@
       'Linux64 GCC': {
         'recipe_config': 'webrtc_gcc',
         'chromium_config_kwargs': {
           'BUILD_CONFIG': 'Release',
           'TARGET_BITS': 64,
         },
         'bot_type': 'builder',
         'testing': {'platform': 'linux'},
       },
       'Android32 Release (swarming)': {
-        'recipe_config': 'webrtc_android_swarming',
+        'recipe_config': 'webrtc_android',
         'chromium_config_kwargs': {
           'BUILD_CONFIG': 'Release',
           'TARGET_PLATFORM': 'android',
           'TARGET_ARCH': 'arm',
           'TARGET_BITS': 32,
         },
         'bot_type': 'builder_tester',
         'testing': {'platform': 'linux'},
         'use_isolate': True,
         'enable_swarming': True,
@@ skipping 664 matching lines @@
         'chromium_config_kwargs': {
           'BUILD_CONFIG': 'Release',
           'TARGET_PLATFORM': 'android',
           'TARGET_ARCH': 'arm',
           'TARGET_BITS': 32,
         },
         'bot_type': 'builder',
         'testing': {'platform': 'linux'},
       },
       'android_swarming': {
-        'recipe_config': 'webrtc_android_swarming',
+        'recipe_config': 'webrtc_android',
         'chromium_config_kwargs': {
           'BUILD_CONFIG': 'Release',
           'TARGET_PLATFORM': 'android',
           'TARGET_ARCH': 'arm',
           'TARGET_BITS': 32,
         },
         'bot_type': 'builder_tester',
         'testing': {'platform': 'linux'},
         'use_isolate': True,
         'enable_swarming': True,
         'swarming_dimensions': {
           'os': 'Android',
           'device_type': 'bullhead', # Nexus 5X
         }
       }
     },
   },
 })