Reland of Android: Change camera fps range selection

webrtc/build/android_tests.gyp

 # Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
 #
 # Use of this source code is governed by a BSD-style license
 # that can be found in the LICENSE file in the root of the source
 # tree. An additional intellectual property rights grant can be found
 # in the file PATENTS.  All contributing project authors may
 # be found in the AUTHORS file in the root of the source tree.
 
 # This file exists in two versions. A no-op version under
 # webrtc/build/android_tests_noop.gyp and this one. This gyp file builds the
 # tests (for Android) assuming that WebRTC is built inside a Chromium
 # workspace. The no-op version is included when building WebRTC without
 # Chromium. This is a workaround for the fact that 'includes' don't expand
 # variables and that the relative location of apk_test.gypi is different for
 # WebRTC when built as part of Chromium and when it is built without Chromium.
 {
   'includes': [
     'common.gypi',
   ],
-  'variables': {
-    'shard_timeout': 900,
-  },
   'targets': [
     {
       'target_name': 'audio_codec_speed_tests_apk',
       'type': 'none',
       'variables': {
+        'shard_timeout': 900,
         'test_suite_name': 'audio_codec_speed_tests',
         'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)audio_codec_speed_tests<(SHARED_LIB_SUFFIX)',
         'isolate_file': '../modules/audio_codec_speed_tests.isolate',
       },
       'dependencies': [
         '<(webrtc_root)/modules/modules.gyp:audio_codec_speed_tests',
       ],
       'includes': [
         '../../build/apk_test.gypi',
       ],
     },
     {
       'target_name': 'audio_decoder_unittests_apk',
       'type': 'none',
       'variables': {
+        'shard_timeout': 900,
         'test_suite_name': 'audio_decoder_unittests',
         'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)audio_decoder_unittests<(SHARED_LIB_SUFFIX)',
         'isolate_file': '../modules/audio_decoder_unittests.isolate',
       },
       'dependencies': [
         '<(webrtc_root)/modules/modules.gyp:audio_decoder_unittests',
       ],
       'includes': [
         '../../build/apk_test.gypi',
       ],
     },
     {
       'target_name': 'common_audio_unittests_apk',
       'type': 'none',
       'variables': {
+        'shard_timeout': 900,
         'test_suite_name': 'common_audio_unittests',
         'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)common_audio_unittests<(SHARED_LIB_SUFFIX)',
         'isolate_file': '../common_audio/common_audio_unittests.isolate',
       },
       'dependencies': [
         '<(webrtc_root)/common_audio/common_audio.gyp:common_audio_unittests',
       ],
       'includes': [
         '../../build/apk_test.gypi',
       ],
     },
     {
       'target_name': 'common_video_unittests_apk',
       'type': 'none',
       'variables': {
+        'shard_timeout': 900,
         'test_suite_name': 'common_video_unittests',
         'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)common_video_unittests<(SHARED_LIB_SUFFIX)',
         'isolate_file': '../common_video/common_video_unittests.isolate',
       },
       'dependencies': [
         '<(webrtc_root)/common_video/common_video_unittests.gyp:common_video_unittests',
       ],
       'includes': [
         '../../build/apk_test.gypi',
       ],
     },
     {
       'target_name': 'modules_tests_apk',
       'type': 'none',
       'variables': {
+        'shard_timeout': 900,
         'test_suite_name': 'modules_tests',
         'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)modules_tests<(SHARED_LIB_SUFFIX)',
         'isolate_file': '../modules/modules_tests.isolate',
       },
       'dependencies': [
         '<(webrtc_root)/modules/modules.gyp:modules_tests',
       ],
       'includes': [
         '../../build/apk_test.gypi',
       ],
     },
     {
       'target_name': 'modules_unittests_apk',
       'type': 'none',
       'variables': {
+        'shard_timeout': 900,
         'test_suite_name': 'modules_unittests',
         'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)modules_unittests<(SHARED_LIB_SUFFIX)',
         'isolate_file': '../modules/modules_unittests.isolate',
       },
       'dependencies': [
         '<(webrtc_root)/modules/modules.gyp:modules_unittests',
         'audio_device_java',
       ],
       'includes': [
         '../../build/apk_test.gypi',
       ],
     },
     {
       'target_name': 'peerconnection_unittests_apk',
       'type': 'none',
       'variables': {
+        'shard_timeout': 900,
         'test_suite_name': 'peerconnection_unittests',
         'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)peerconnection_unittests<(SHARED_LIB_SUFFIX)',
         'isolate_file': '../api/peerconnection_unittests.isolate',
       },
       'dependencies': [
         '<(webrtc_root)/api/api_tests.gyp:peerconnection_unittests',
         '<(webrtc_root)/api/api.gyp:libjingle_peerconnection_java',
       ],
       'includes': [
         '../../build/apk_test.gypi',
       ],
     },
     {
       'target_name': 'rtc_unittests_apk',
       'type': 'none',
       'variables': {
+        'shard_timeout': 900,
         'test_suite_name': 'rtc_unittests',
         'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)rtc_unittests<(SHARED_LIB_SUFFIX)',
         'isolate_file': '../rtc_unittests.isolate',
       },
       'dependencies': [
         '<(webrtc_root)/webrtc.gyp:rtc_unittests',
       ],
       'includes': [
         '../../build/apk_test.gypi',
       ],
     },
     {
       'target_name': 'system_wrappers_unittests_apk',
       'type': 'none',
       'variables': {
+        'shard_timeout': 900,
         'test_suite_name': 'system_wrappers_unittests',
         'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)system_wrappers_unittests<(SHARED_LIB_SUFFIX)',
         'isolate_file': '../system_wrappers/system_wrappers_unittests.isolate',
       },
       'dependencies': [
         '<(webrtc_root)/system_wrappers/system_wrappers_tests.gyp:system_wrappers_unittests',
       ],
       'includes': [
         '../../build/apk_test.gypi',
       ],
     },
     {
       'target_name': 'test_support_unittests_apk',
       'type': 'none',
       'variables': {
+        'shard_timeout': 900,
         'test_suite_name': 'test_support_unittests',
         'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)test_support_unittests<(SHARED_LIB_SUFFIX)',
         'isolate_file': '../test/test_support_unittests.isolate',
       },
       'dependencies': [
         '<(webrtc_root)/test/test.gyp:test_support_unittests',
       ],
       'includes': [
         '../../build/apk_test.gypi',
       ],
     },
     {
       'target_name': 'tools_unittests_apk',
       'type': 'none',
       'variables': {
+        'shard_timeout': 900,
         'test_suite_name': 'tools_unittests',
         'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)tools_unittests<(SHARED_LIB_SUFFIX)',
         'isolate_file': '../tools/tools_unittests.isolate',
       },
       'dependencies': [
         '<(webrtc_root)/tools/tools.gyp:tools_unittests',
       ],
       'includes': [
         '../../build/apk_test.gypi',
       ],
     },
     {
       'target_name': 'video_engine_tests_apk',
       'type': 'none',
       'variables': {
+        'shard_timeout': 900,
         'test_suite_name': 'video_engine_tests',
         'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)video_engine_tests<(SHARED_LIB_SUFFIX)',
         'isolate_file': '../video_engine_tests.isolate',
       },
       'dependencies': [
         '<(webrtc_root)/webrtc.gyp:video_engine_tests',
       ],
       'includes': [
         '../../build/apk_test.gypi',
       ],
      },
      {
       'target_name': 'voice_engine_unittests_apk',
       'type': 'none',
       'variables': {
+        'shard_timeout': 900,
         'test_suite_name': 'voice_engine_unittests',
         'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)voice_engine_unittests<(SHARED_LIB_SUFFIX)',
         'isolate_file': '../voice_engine/voice_engine_unittests.isolate',
       },
       'dependencies': [
         '<(webrtc_root)/voice_engine/voice_engine.gyp:voice_engine_unittests',
       ],
       'includes': [
         '../../build/apk_test.gypi',
       ],
@@ skipping 11 matching lines @@
         '<(webrtc_root)/webrtc.gyp:webrtc_perf_tests',
       ],
       'includes': [
         '../../build/apk_test.gypi',
       ],
     },
     {
       'target_name': 'webrtc_nonparallel_tests_apk',
       'type': 'none',
       'variables': {
+        'shard_timeout': 900,
         'test_suite_name': 'webrtc_nonparallel_tests',
         'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)webrtc_nonparallel_tests<(SHARED_LIB_SUFFIX)',
         'isolate_file': '../webrtc_nonparallel_tests.isolate',
       },
       'dependencies': [
         '<(webrtc_root)/webrtc.gyp:webrtc_nonparallel_tests',
       ],
       'includes': [
         '../../build/apk_test.gypi',
       ],
     },
     {
+      'target_name': 'android_junit_tests',
+      'type': 'none',
+      'dependencies': [
+        '<(webrtc_root)/api/api.gyp:libjingle_peerconnection_java',
+        '<(DEPTH)/base/base.gyp:base_java',
+        '<(DEPTH)/base/base.gyp:base_java_test_support',
+        '<(DEPTH)/base/base.gyp:base_junit_test_support',
+      ],
+      'variables': {
+        'main_class': 'org.chromium.testing.local.JunitTestMain',
+        'src_paths': [
+          '../androidjunit/',
+        ],
+        'test_type': 'junit',
+        'wrapper_script_name': 'helper/<(_target_name)',
+      },
+      'includes': [
+        '../../build/android/test_runner.gypi',
+        '../../build/host_jar.gypi',
+      ],
+    },
+    {
       'target_name': 'audio_device_java',
       'type': 'none',
       'variables': {
         'java_in_dir': '<(webrtc_root)/modules/audio_device/android/java',
         'additional_src_dirs': [ '<(webrtc_root)/base/java/src', ],
         'never_lint': 1,
       },
       'includes': [
         '../../build/java.gypi',
       ],
     },
   ],
 }
-
-