| 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 593 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 604 ] | 604 ] |
| 605 data = video_engine_tests_resources | 605 data = video_engine_tests_resources |
| 606 if (!build_with_chromium && is_clang) { | 606 if (!build_with_chromium && is_clang) { |
| 607 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). | 607 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). |
| 608 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] | 608 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] |
| 609 } | 609 } |
| 610 if (is_android) { | 610 if (is_android) { |
| 611 deps += [ "//testing/android/native_test:native_test_native_code" ] | 611 deps += [ "//testing/android/native_test:native_test_native_code" ] |
| 612 shard_timeout = 900 | 612 shard_timeout = 900 |
| 613 } | 613 } |
| 614 | |
| 615 if (is_ios) { | 614 if (is_ios) { |
| 616 deps += [ ":video_engine_tests_bundle_data" ] | 615 deps += [ ":video_engine_tests_bundle_data" ] |
| 617 } | 616 } |
| 618 } | 617 } |
| 619 | 618 |
| 620 webrtc_perf_tests_resources = [ | 619 webrtc_perf_tests_resources = [ |
| 621 "//resources/audio_coding/speech_mono_16kHz.pcm", | 620 "//resources/audio_coding/speech_mono_16kHz.pcm", |
| 622 "//resources/audio_coding/testfile32kHz.pcm", | 621 "//resources/audio_coding/testfile32kHz.pcm", |
| 623 "//resources/ConferenceMotion_1280_720_50.yuv", | 622 "//resources/ConferenceMotion_1280_720_50.yuv", |
| 624 "//resources/difficult_photo_1850_1110.yuv", | 623 "//resources/difficult_photo_1850_1110.yuv", |
| (...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 682 deps += [ "//testing/android/native_test:native_test_native_code" ] | 681 deps += [ "//testing/android/native_test:native_test_native_code" ] |
| 683 shard_timeout = 2700 | 682 shard_timeout = 2700 |
| 684 } | 683 } |
| 685 if (is_ios) { | 684 if (is_ios) { |
| 686 deps += [ ":webrtc_perf_tests_bundle_data" ] | 685 deps += [ ":webrtc_perf_tests_bundle_data" ] |
| 687 } | 686 } |
| 688 if (!build_with_chromium && is_clang) { | 687 if (!build_with_chromium && is_clang) { |
| 689 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). | 688 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). |
| 690 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] | 689 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] |
| 691 } | 690 } |
| 691 if (rtc_use_h264) { |
| 692 defines += [ "WEBRTC_USE_H264" ] |
| 693 } |
| 692 } | 694 } |
| 693 | 695 |
| 694 rtc_test("webrtc_nonparallel_tests") { | 696 rtc_test("webrtc_nonparallel_tests") { |
| 695 testonly = true | 697 testonly = true |
| 696 configs += [ ":rtc_unittests_config" ] | 698 configs += [ ":rtc_unittests_config" ] |
| 697 sources = [ | 699 sources = [ |
| 698 "base/nullsocketserver_unittest.cc", | 700 "base/nullsocketserver_unittest.cc", |
| 699 "base/physicalsocketserver_unittest.cc", | 701 "base/physicalsocketserver_unittest.cc", |
| 700 "base/socket_unittest.cc", | 702 "base/socket_unittest.cc", |
| 701 "base/socket_unittest.h", | 703 "base/socket_unittest.h", |
| (...skipping 29 matching lines...) Expand all Loading... |
| 731 | 733 |
| 732 deps = [ | 734 deps = [ |
| 733 "//base:base_java_test_support", | 735 "//base:base_java_test_support", |
| 734 "//webrtc/api:libjingle_peerconnection_java", | 736 "//webrtc/api:libjingle_peerconnection_java", |
| 735 "//webrtc/api:libjingle_peerconnection_jni", | 737 "//webrtc/api:libjingle_peerconnection_jni", |
| 736 "//webrtc/examples:AppRTCMobile_javalib", | 738 "//webrtc/examples:AppRTCMobile_javalib", |
| 737 ] | 739 ] |
| 738 } | 740 } |
| 739 } | 741 } |
| 740 } | 742 } |
| OLD | NEW |