Revert of WebRTC: Add android_junit_tests.

scripts/slave/recipe_modules/webrtc/api.py

 # Copyright 2013 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.
 
 from recipe_engine.types import freeze
 from recipe_engine import recipe_api
 from . import builders
 from . import steps
 
 
@@ skipping 22 matching lines @@
     'rtc_stats_unittests',
     'rtc_unittests',
     'system_wrappers_unittests',
     'test_support_unittests',
     'tools_unittests',
     'video_engine_tests',
     'voice_engine_unittests',
     'xmllite_xmpp_unittests',
   )
 
-  ANDROID_DEVICE_TESTS = (
+  # Android APK tests.
+  ANDROID_APK_TESTS = (
     'audio_decoder_unittests',
     'common_audio_unittests',
     'common_video_unittests',
     'modules_tests',
     'modules_unittests',
     'peerconnection_unittests',
     'rtc_stats_unittests',
     'rtc_unittests',
     'system_wrappers_unittests',
     'test_support_unittests',
     'tools_unittests',
     'video_engine_tests',
     'voice_engine_unittests',
     'webrtc_nonparallel_tests',
   )
 
-  ANDROID_LINUX_TESTS = (
-    'android_junit_tests',
-  )
-
   ANDROID_INSTRUMENTATION_TESTS = (
     'AppRTCMobileTest',
     'libjingle_peerconnection_android_unittest',
   )
 
   DASHBOARD_UPLOAD_URL = 'https://chromeperf.appspot.com'
 
   @property
   def should_build(self):
     return self.bot_type in ('builder', 'builder_tester')
@@ skipping 50 matching lines @@
       self.m.gclient.apply_config(c)
 
     if self.m.tryserver.is_tryserver:
       self.m.chromium.apply_config('trybot_flavor')
 
   def configure_swarming(self):
     self.c.use_isolate = self.bot_config.get('use_isolate')
     self.c.enable_swarming = self.bot_config.get('enable_swarming')
     if self.c.use_isolate:
       self.m.isolate.set_isolate_environment(self.m.chromium.c)
-      self._isolated_targets = tuple()
       if self.c.TEST_SUITE == 'webrtc':
-        self._isolated_targets += self.NORMAL_TESTS
-      if self.c.TEST_SUITE in ('android_linux', 'android_swarming'):
-        self._isolated_targets += self.ANDROID_LINUX_TESTS
-      if self.c.TEST_SUITE in ('android_device', 'android_swarming'):
-        self._isolated_targets += (self.ANDROID_DEVICE_TESTS +
+        self._isolated_targets = self.NORMAL_TESTS
+      elif self.c.TEST_SUITE == 'android':
+        self._isolated_targets = (self.ANDROID_APK_TESTS +
             self.ANDROID_INSTRUMENTATION_TESTS)
-      if not self._isolated_targets: # pragma: no cover
+      else: # pragma: no cover
         raise self.m.step.StepFailure('Isolation and swarming are only '
-                                      'supported for webrtc, android_linux and '
-                                      'android_device test suites.')
+                                      'supported for webrtc and android test '
+                                      'suites.')
 
     self.c.enable_swarming = self.bot_config.get('enable_swarming')
     if self.c.enable_swarming:
       self.m.chromium_swarming.configure_swarming(
           'webrtc',
           precommit=self.m.tryserver.is_tryserver,
           mastername=self.mastername)
       self.m.swarming.set_default_dimension(
           'os',
           self.m.swarming.prefered_os_dimension(
@@ skipping 46 matching lines @@
     with self.m.step.context(context):
       if self.c.use_isolate:
         self.m.isolate.remove_build_metadata()
         self.m.isolate.isolate_tests(self.m.chromium.output_dir,
                                      targets=self._isolated_targets)
 
       tests = steps.generate_tests(self, self.c.TEST_SUITE, self.revision,
                                    self.c.enable_swarming)
       with self.m.step.defer_results():
         if tests:
-          run_android_device_steps = (not self.c.enable_swarming and
-              self.m.chromium.c.TARGET_PLATFORM == 'android' and
-              self.c.TEST_SUITE != 'android_linux')
-
-          if run_android_device_steps:
+          if (self.m.chromium.c.TARGET_PLATFORM == 'android' and
+              not self.c.enable_swarming):
             self.m.chromium_android.common_tests_setup_steps()
 
           for test in tests:
             test.run(self, suffix='')
 
-          if run_android_device_steps:
+          if (self.m.chromium.c.TARGET_PLATFORM == 'android' and
+              not self.c.enable_swarming):
             self.m.chromium_android.shutdown_device_monitor()
             self.m.chromium_android.logcat_dump(
                 gs_bucket=self.master_config.get('build_gs_bucket'))
             self.m.chromium_android.stack_tool_steps(force_latest_version=True)
             self.m.chromium_android.test_report()
 
       with self.m.step.defer_results():
         for test in tests:
           if test.enable_swarming:
             self.m.swarming.collect_task(test.swarming_task)
@@ skipping 116 matching lines @@
   def clean_test_output(self):
     """Remove all test output in out/, since we have tests leaking files."""
     out_dir = self.m.path['checkout'].join('out')
     self.m.python('clean test output files',
                   script=self.resource('cleanup_files.py'),
                   args=[out_dir],
                   infra_step=True)
 
   def virtual_webcam_check(self):
     self.m.python('webcam_check', self.resource('ensure_webcam_is_running.py'))