WebRTC: Remove android_apk recipe

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.
 
 RECIPE_CONFIGS = {
   'webrtc': {
     'webrtc_config': 'webrtc',
@@ skipping 10 matching lines @@
   'webrtc_asan': {
     'webrtc_config': 'webrtc_asan',
     'test_suite': 'webrtc',
   },
   'webrtc_lsan': {
     'webrtc_config': 'webrtc_lsan',
     'test_suite': 'webrtc',
   },
   'webrtc_android': {
     'webrtc_config': 'webrtc_android',
+    'test_suite': 'android',
   },
   'webrtc_android_clang': {
     'webrtc_config': 'webrtc_android_clang',
   },
-  'webrtc_android_apk': {
-    'webrtc_config': 'webrtc_android_apk',
-  },
   'webrtc_ios': {
     'webrtc_config': 'webrtc_ios',
   },
   'chromium_webrtc': {
     'chromium_config': 'chromium',
     'webrtc_config': 'chromium',
     'gclient_config': 'chromium_webrtc',
     'compile_targets': ['chromium_builder_webrtc'],
     'test_suite': 'chromium',
   },
@@ skipping 625 matching lines @@
       'Linux64 Release [large tests]': {
         'recipe_config': 'webrtc_baremetal',
         'webrtc_config_kwargs': {
           'BUILD_CONFIG': 'Release',
           'TARGET_BITS': 64,
           'PERF_ID': 'webrtc-linux-large-tests',
         },
         'bot_type': 'builder_tester',
         'testing': {'platform': 'linux'},
       },
-      'Android': {
+      'Android Builder': {
         'recipe_config': 'webrtc_android',
         'webrtc_config_kwargs': {
           'BUILD_CONFIG': 'Release',
           'TARGET_PLATFORM': 'android',
           'TARGET_ARCH': 'arm',
           'TARGET_BITS': 32,
         },
         'bot_type': 'builder',
+        'build_gs_archive': 'android_apk_rel_archive',
         'testing': {'platform': 'linux'},
       },
-      'Android (dbg)': {
+      'Android Builder (dbg)': {
         'recipe_config': 'webrtc_android',
         'webrtc_config_kwargs': {
           'BUILD_CONFIG': 'Debug',
           'TARGET_PLATFORM': 'android',
           'TARGET_ARCH': 'arm',
           'TARGET_BITS': 32,
         },
         'bot_type': 'builder',
+        'build_gs_archive': 'android_apk_dbg_archive',
         'testing': {'platform': 'linux'},
       },
       'Android ARM64 (dbg)': {
         'recipe_config': 'webrtc_android',
         'webrtc_config_kwargs': {
           'BUILD_CONFIG': 'Debug',
           'TARGET_PLATFORM': 'android',
           'TARGET_ARCH': 'arm',
           'TARGET_BITS': 64,
         },
@@ skipping 28 matching lines @@
         'webrtc_config_kwargs': {
           'BUILD_CONFIG': 'Debug',
           'TARGET_PLATFORM': 'android',
           'TARGET_ARCH': 'arm',
           'TARGET_BITS': 32,
         },
         'chromium_apply_config': ['webrtc_gn'],
         'bot_type': 'builder',
         'testing': {'platform': 'linux'},
       },
-      'Android Chromium-APK Builder (dbg)': {
-        'recipe_config': 'webrtc_android_apk',
+      'Android Tests (KK Nexus5)(dbg)': {
+        'recipe_config': 'webrtc_android',
         'webrtc_config_kwargs': {
           'BUILD_CONFIG': 'Debug',
           'TARGET_PLATFORM': 'android',
-          'TARGET_ARCH': 'arm',
-          'TARGET_BITS': 32,
-        },
-        'bot_type': 'builder',
-        'build_gs_archive': 'android_apk_dbg_archive',
-        'testing': {'platform': 'linux'},
-      },
-      'Android Chromium-APK Builder': {
-        'recipe_config': 'webrtc_android_apk',
-        'webrtc_config_kwargs': {
-          'BUILD_CONFIG': 'Release',
-          'TARGET_PLATFORM': 'android',
-          'TARGET_ARCH': 'arm',
-          'TARGET_BITS': 32,
-        },
-        'bot_type': 'builder',
-        'build_gs_archive': 'android_apk_rel_archive',
-        'testing': {'platform': 'linux'},
-      },
-      'Android Chromium-APK Tests (KK Nexus5)(dbg)': {
-        'recipe_config': 'webrtc_android_apk',
-        'webrtc_config_kwargs': {
-          'BUILD_CONFIG': 'Debug',
-          'TARGET_PLATFORM': 'android',
           'TARGET_ARCH': 'arm',
           'TARGET_BITS': 32,
         },
         'bot_type': 'tester',
-        'parent_buildername': 'Android Chromium-APK Builder (dbg)',
+        'parent_buildername': 'Android Builder (dbg)',
         'build_gs_archive': 'android_apk_dbg_archive',
         'testing': {'platform': 'linux'},
       },
-      'Android Chromium-APK Tests (KK Nexus5)': {
-        'recipe_config': 'webrtc_android_apk',
+      'Android Tests (KK Nexus5)': {
+        'recipe_config': 'webrtc_android',
         'webrtc_config_kwargs': {
           'BUILD_CONFIG': 'Release',
           'TARGET_PLATFORM': 'android',
           'TARGET_ARCH': 'arm',
           'TARGET_BITS': 32,
         },
         'bot_type': 'tester',
-        'parent_buildername': 'Android Chromium-APK Builder',
+        'parent_buildername': 'Android Builder',
         'build_gs_archive': 'android_apk_rel_archive',
         'testing': {'platform': 'linux'},
       },
-      'Android Chromium-APK Tests (JB Nexus7.2)(dbg)': {
-        'recipe_config': 'webrtc_android_apk',
+      'Android Tests (JB Nexus7.2)(dbg)': {
+        'recipe_config': 'webrtc_android',
         'webrtc_config_kwargs': {
           'BUILD_CONFIG': 'Debug',
           'TARGET_PLATFORM': 'android',
           'TARGET_ARCH': 'arm',
           'TARGET_BITS': 32,
         },
         'bot_type': 'tester',
-        'parent_buildername': 'Android Chromium-APK Builder (dbg)',
+        'parent_buildername': 'Android Builder (dbg)',
         'build_gs_archive': 'android_apk_dbg_archive',
         'testing': {'platform': 'linux'},
       },
-      'Android Chromium-APK Tests (JB Nexus7.2)': {
-        'recipe_config': 'webrtc_android_apk',
+      'Android Tests (JB Nexus7.2)': {
+        'recipe_config': 'webrtc_android',
         'webrtc_config_kwargs': {
           'BUILD_CONFIG': 'Release',
           'TARGET_PLATFORM': 'android',
           'TARGET_ARCH': 'arm',
           'TARGET_BITS': 32,
         },
         'bot_type': 'tester',
-        'parent_buildername': 'Android Chromium-APK Builder',
+        'parent_buildername': 'Android Builder',
         'build_gs_archive': 'android_apk_rel_archive',
         'testing': {'platform': 'linux'},
       },
     },
   },
   'client.webrtc.fyi': {
     'builders':  {
       'Linux TsanRV': {
         'recipe_config': 'webrtc',
         'chromium_apply_config': ['tsan_race_verifier'],
@@ skipping 273 matching lines @@
         'testing': {'platform': 'linux'},
       },
       'android': {
         'recipe_config': 'webrtc_android',
         'webrtc_config_kwargs': {
           'BUILD_CONFIG': 'Debug',
           'TARGET_PLATFORM': 'android',
           'TARGET_ARCH': 'arm',
           'TARGET_BITS': 32,
         },
-        'bot_type': 'builder',
+        'bot_type': 'builder_tester',
         'testing': {'platform': 'linux'},
       },
       'android_rel': {
         'recipe_config': 'webrtc_android',
         'webrtc_config_kwargs': {
           'BUILD_CONFIG': 'Release',
           'TARGET_PLATFORM': 'android',
           'TARGET_ARCH': 'arm',
           'TARGET_BITS': 32,
         },
-        'bot_type': 'builder',
+        'bot_type': 'builder_tester',
         'testing': {'platform': 'linux'},
       },
       'android_clang': {
         'recipe_config': 'webrtc_android_clang',
         'webrtc_config_kwargs': {
           'BUILD_CONFIG': 'Debug',
           'TARGET_PLATFORM': 'android',
           'TARGET_ARCH': 'arm',
           'TARGET_BITS': 32,
         },
@@ skipping 28 matching lines @@
         'webrtc_config_kwargs': {
           'BUILD_CONFIG': 'Release',
           'TARGET_PLATFORM': 'android',
           'TARGET_ARCH': 'arm',
           'TARGET_BITS': 32,
         },
         'chromium_apply_config': ['webrtc_gn'],
         'bot_type': 'builder',
         'testing': {'platform': 'linux'},
       },
-      'android_apk': {
-        'recipe_config': 'webrtc_android_apk',
-        'webrtc_config_kwargs': {
-          'BUILD_CONFIG': 'Debug',
-          'TARGET_PLATFORM': 'android',
-          'TARGET_ARCH': 'arm',
-          'TARGET_BITS': 32,
-        },
-        'bot_type': 'builder_tester',
-        'testing': {'platform': 'linux'},
-      },
-      'android_apk_rel': {
-        'recipe_config': 'webrtc_android_apk',
-        'webrtc_config_kwargs': {
-          'BUILD_CONFIG': 'Release',
-          'TARGET_PLATFORM': 'android',
-          'TARGET_ARCH': 'arm',
-          'TARGET_BITS': 32,
-        },
-        'bot_type': 'builder_tester',
-        'testing': {'platform': 'linux'},
-      },
     },
   },
 }