Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(65)

Side by Side Diff: webrtc/webrtc_tests.gypi

Issue 2021233002: Revert of Android: Change camera fps range selection (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « webrtc/api/java/android/org/webrtc/CameraEnumerationAndroid.java ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2013 The WebRTC project authors. All Rights Reserved. 1 # Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
2 # 2 #
3 # Use of this source code is governed by a BSD-style license 3 # Use of this source code is governed by a BSD-style license
4 # that can be found in the LICENSE file in the root of the source 4 # that can be found in the LICENSE file in the root of the source
5 # tree. An additional intellectual property rights grant can be found 5 # tree. An additional intellectual property rights grant can be found
6 # in the file PATENTS. All contributing project authors may 6 # in the file PATENTS. All contributing project authors may
7 # be found in the AUTHORS file in the root of the source tree. 7 # be found in the AUTHORS file in the root of the source tree.
8 { 8 {
9 'targets': [ 9 'targets': [
10 { 10 {
(...skipping 335 matching lines...) Expand 10 before | Expand all | Expand 10 after
346 '<(apk_tests_path):webrtc_perf_tests_apk', 346 '<(apk_tests_path):webrtc_perf_tests_apk',
347 ], 347 ],
348 }, 348 },
349 { 349 {
350 'target_name': 'webrtc_nonparallel_tests_apk_target', 350 'target_name': 'webrtc_nonparallel_tests_apk_target',
351 'type': 'none', 351 'type': 'none',
352 'dependencies': [ 352 'dependencies': [
353 '<(apk_tests_path):webrtc_nonparallel_tests_apk', 353 '<(apk_tests_path):webrtc_nonparallel_tests_apk',
354 ], 354 ],
355 }, 355 },
356 {
357 'target_name': 'android_junit_tests',
358 'type': 'none',
359 'dependencies': [
360 '<(webrtc_root)/api/api.gyp:libjingle_peerconnection_java',
361 '<(DEPTH)/base/base.gyp:base_java',
362 '<(DEPTH)/base/base.gyp:base_java_test_support',
363 '<(DEPTH)/base/base.gyp:base_junit_test_support',
364 ],
365 'variables': {
366 'main_class': 'org.chromium.testing.local.JunitTestMain',
367 'src_paths': [
368 'androidjunit/',
369 ],
370 'test_type': 'junit',
371 'wrapper_script_name': 'helper/<(_target_name)',
372 },
373 'includes': [
374 '../build/android/test_runner.gypi',
375 '../build/host_jar.gypi',
376 ],
377 },
378 ], 356 ],
379 'conditions': [ 357 'conditions': [
380 ['test_isolation_mode != "noop"', 358 ['test_isolation_mode != "noop"',
381 { 359 {
382 'targets': [ 360 'targets': [
383 { 361 {
384 'target_name': 'rtc_unittests_apk_run', 362 'target_name': 'rtc_unittests_apk_run',
385 'type': 'none', 363 'type': 'none',
386 'dependencies': [ 364 'dependencies': [
387 '<(apk_tests_path):rtc_unittests_apk', 365 '<(apk_tests_path):rtc_unittests_apk',
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
488 'build/isolate.gypi', 466 'build/isolate.gypi',
489 ], 467 ],
490 'sources': [ 468 'sources': [
491 'webrtc_perf_tests.isolate', 469 'webrtc_perf_tests.isolate',
492 ], 470 ],
493 }, 471 },
494 ], 472 ],
495 }], 473 }],
496 ], 474 ],
497 } 475 }
OLDNEW
« no previous file with comments | « webrtc/api/java/android/org/webrtc/CameraEnumerationAndroid.java ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698