OLD | NEW |
1 # Copyright (c) 2014 The WebRTC project authors. All Rights Reserved. | 1 # Copyright (c) 2014 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 # TODO(kjellander): Rebase this to webrtc/build/common.gypi changes after r6330. | 9 # TODO(kjellander): Rebase this to webrtc/build/common.gypi changes after r6330. |
10 | 10 |
(...skipping 398 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
409 | 409 |
410 rtc_test("video_engine_tests") { | 410 rtc_test("video_engine_tests") { |
411 testonly = true | 411 testonly = true |
412 deps = [ | 412 deps = [ |
413 "audio:audio_tests", | 413 "audio:audio_tests", |
414 "base:rtc_base_tests_utils", | 414 "base:rtc_base_tests_utils", |
415 "call:call_tests", | 415 "call:call_tests", |
416 "modules/video_capture", | 416 "modules/video_capture", |
417 "test:test_common", | 417 "test:test_common", |
418 "test:test_main", | 418 "test:test_main", |
| 419 "test:video_test_common", |
419 "video:video_tests", | 420 "video:video_tests", |
420 ] | 421 ] |
421 data = video_engine_tests_resources | 422 data = video_engine_tests_resources |
422 if (!build_with_chromium && is_clang) { | 423 if (!build_with_chromium && is_clang) { |
423 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). | 424 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). |
424 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] | 425 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] |
425 } | 426 } |
426 if (is_android) { | 427 if (is_android) { |
427 deps += [ "//testing/android/native_test:native_test_native_code" ] | 428 deps += [ "//testing/android/native_test:native_test_native_code" ] |
428 shard_timeout = 900 | 429 shard_timeout = 900 |
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
503 ] | 504 ] |
504 | 505 |
505 deps = [ | 506 deps = [ |
506 "//base:base_java_test_support", | 507 "//base:base_java_test_support", |
507 "//webrtc/examples:AppRTCMobile_javalib", | 508 "//webrtc/examples:AppRTCMobile_javalib", |
508 "//webrtc/sdk/android:libjingle_peerconnection_java", | 509 "//webrtc/sdk/android:libjingle_peerconnection_java", |
509 ] | 510 ] |
510 } | 511 } |
511 } | 512 } |
512 } | 513 } |
OLD | NEW |