Android: Change camera fps range selection

webrtc/api/api_tests.gyp

 # Copyright (c) 2015 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.
 
 {
   'includes': [ '../build/common.gypi', ],
@@ skipping 133 matching lines @@
             'is_test_apk': 1,
             'test_type': 'instrumentation',
             'tested_apk_path': '',
             'never_lint': 1,
           },
           'includes': [
             '../../build/java_apk.gypi',
             '../../build/android/test_runner.gypi',
           ],
         },
+
+        {
+          'target_name': 'android_junit_test',

[kjellander_webrtc, 2016/05/30 08:31:53]

Since it's not called api_android_junit_tests, I expect it to contain Android
junit tests for all of WebRTC. 
That's actually something I'd prefer, since I want to have fewer test
executables overall. But in that case, it should be moved to a higher level,
like
https://chromium.googlesource.com/external/webrtc/+/master/webrtc/webrtc_test....

[kjellander_webrtc, 2016/05/30 08:31:53]

Please name this android_junit_tests to conform with established convention
(libjingle_peerconnection_android_unittest above is one of few violations). 

[magjed_webrtc, 2016/05/30 12:47:07]

Done, I moved the build target to webrtc_tests.gypi and moved the androidjunit
folder from webrtc/api to webrtc/. Do I need to add a case for
'test_isolation_mode != "noop"' as well?

[magjed_webrtc, 2016/05/30 12:47:07]

Done.

[kjellander_webrtc, 2016/05/30 12:57:28]

No that stuff is only needed for tests that run on swarming and/or Android
devices. And it's only needed if the test depends on any resource files (like
audio/video files), so it can wait until that's true.

+          '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)',

[kjellander_webrtc, 2016/05/30 08:31:53]

Does compilation of this target generate a run_ script in
out/{Debug,Release}/bin/run_android_junit_test, that works to run
out-of-the-box?
If so, that's great (easier to add to the bots).

[magjed_webrtc, 2016/05/30 12:47:07]

Yes, a working run script is generated :)

+          },
+          'includes': [
+            '../../build/host_jar.gypi',

[kjellander_webrtc, 2016/05/30 08:31:53]

sort alphabetically.

[magjed_webrtc, 2016/05/30 12:47:07]

Done.

+            '../../build/android/test_runner.gypi',
+          ],
+        },
       ],  # targets
     }],  # OS=="android"
     ['OS=="android"', {
       'targets': [
         {
           'target_name': 'peerconnection_unittests_apk_target',
           'type': 'none',
           'dependencies': [
             '<(apk_tests_path):peerconnection_unittests_apk',
           ],
@@ skipping 33 matching lines @@
             '../build/isolate.gypi',
           ],
           'sources': [
             'peerconnection_unittests.isolate',
           ],
         },
       ],  # targets
     }],  # test_isolation_mode != "noop"
   ],  # conditions
 }