| 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 378 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 389 if (rtc_enable_protobuf) { | 389 if (rtc_enable_protobuf) { |
| 390 deps += [ "logging:rtc_event_log_tests" ] | 390 deps += [ "logging:rtc_event_log_tests" ] |
| 391 } | 391 } |
| 392 | 392 |
| 393 if (is_android) { | 393 if (is_android) { |
| 394 deps += [ "//testing/android/native_test:native_test_support" ] | 394 deps += [ "//testing/android/native_test:native_test_support" ] |
| 395 shard_timeout = 900 | 395 shard_timeout = 900 |
| 396 } | 396 } |
| 397 | 397 |
| 398 if (is_ios || is_mac) { | 398 if (is_ios || is_mac) { |
| 399 deps += [ "sdk:rtc_sdk_peerconnection_objc_unittests" ] | 399 deps += [ "sdk:objc_peerconnection_unittests" ] |
| 400 } | 400 } |
| 401 } | 401 } |
| 402 | 402 |
| 403 # TODO(pbos): Rename test suite, this is no longer "just" for video targets. | 403 # TODO(pbos): Rename test suite, this is no longer "just" for video targets. |
| 404 video_engine_tests_resources = [ | 404 video_engine_tests_resources = [ |
| 405 "//resources/foreman_cif_short.yuv", | 405 "//resources/foreman_cif_short.yuv", |
| 406 "//resources/voice_engine/audio_long16.pcm", | 406 "//resources/voice_engine/audio_long16.pcm", |
| 407 ] | 407 ] |
| 408 | 408 |
| 409 if (is_ios) { | 409 if (is_ios) { |
| (...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 512 ] | 512 ] |
| 513 | 513 |
| 514 deps = [ | 514 deps = [ |
| 515 "//base:base_java_test_support", | 515 "//base:base_java_test_support", |
| 516 "//webrtc/examples:AppRTCMobile_javalib", | 516 "//webrtc/examples:AppRTCMobile_javalib", |
| 517 "//webrtc/sdk/android:libjingle_peerconnection_java", | 517 "//webrtc/sdk/android:libjingle_peerconnection_java", |
| 518 ] | 518 ] |
| 519 } | 519 } |
| 520 } | 520 } |
| 521 } | 521 } |
| OLD | NEW |