| 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 682 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 693 "test:test_main", | 693 "test:test_main", |
| 694 "video:video_tests", | 694 "video:video_tests", |
| 695 ] | 695 ] |
| 696 if (is_clang) { | 696 if (is_clang) { |
| 697 # Suppress warnings from the Chromium Clang plugin. | 697 # Suppress warnings from the Chromium Clang plugin. |
| 698 # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. | 698 # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. |
| 699 configs -= [ "//build/config/clang:find_bad_constructs" ] | 699 configs -= [ "//build/config/clang:find_bad_constructs" ] |
| 700 } | 700 } |
| 701 if (is_android) { | 701 if (is_android) { |
| 702 deps += [ "//testing/android/native_test:native_test_native_code" ] | 702 deps += [ "//testing/android/native_test:native_test_native_code" ] |
| 703 shard_timeout = 900 |
| 704 } |
| 705 if (is_android || is_ios) { |
| 703 data = [ | 706 data = [ |
| 704 "//resources/foreman_cif_short.yuv", | 707 "//resources/foreman_cif_short.yuv", |
| 705 "//resources/voice_engine/audio_long16.pcm", | 708 "//resources/voice_engine/audio_long16.pcm", |
| 706 ] | 709 ] |
| 707 shard_timeout = 900 | |
| 708 } | 710 } |
| 709 } | 711 } |
| 710 | 712 |
| 711 source_set("video_quality_test") { | 713 source_set("video_quality_test") { |
| 712 testonly = true | 714 testonly = true |
| 713 configs += [ ":common_config" ] | 715 configs += [ ":common_config" ] |
| 714 public_configs = [ ":common_inherited_config" ] | 716 public_configs = [ ":common_inherited_config" ] |
| 715 sources = [ | 717 sources = [ |
| 716 "video/video_quality_test.cc", | 718 "video/video_quality_test.cc", |
| 717 "video/video_quality_test.h", | 719 "video/video_quality_test.h", |
| (...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 823 if (is_ios || (is_mac && target_cpu != "x86")) { | 825 if (is_ios || (is_mac && target_cpu != "x86")) { |
| 824 defines = [ "CARBON_DEPRECATED=YES" ] | 826 defines = [ "CARBON_DEPRECATED=YES" ] |
| 825 } | 827 } |
| 826 if (is_clang) { | 828 if (is_clang) { |
| 827 # Suppress warnings from the Chromium Clang plugin. | 829 # Suppress warnings from the Chromium Clang plugin. |
| 828 # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. | 830 # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. |
| 829 configs -= [ "//build/config/clang:find_bad_constructs" ] | 831 configs -= [ "//build/config/clang:find_bad_constructs" ] |
| 830 } | 832 } |
| 831 } | 833 } |
| 832 } | 834 } |
| OLD | NEW |