| 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 678 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 689 "test:test_common", | 689 "test:test_common", |
| 690 "test:test_main", | 690 "test:test_main", |
| 691 "video:video_tests", | 691 "video:video_tests", |
| 692 ] | 692 ] |
| 693 if (is_clang) { | 693 if (is_clang) { |
| 694 # Suppress warnings from the Chromium Clang plugin. | 694 # Suppress warnings from the Chromium Clang plugin. |
| 695 # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. | 695 # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. |
| 696 configs -= [ "//build/config/clang:find_bad_constructs" ] | 696 configs -= [ "//build/config/clang:find_bad_constructs" ] |
| 697 } | 697 } |
| 698 if (is_android) { | 698 if (is_android) { |
| 699 deps += [ "//testing/android/native_test:native_test_native_code" ] |
| 700 data = [ |
| 701 "//resources/foreman_cif_short.yuv", |
| 702 "//resources/voice_engine/audio_long16.pcm", |
| 703 ] |
| 699 shard_timeout = 900 | 704 shard_timeout = 900 |
| 700 } | 705 } |
| 701 } | 706 } |
| 702 | 707 |
| 703 source_set("video_quality_test") { | 708 source_set("video_quality_test") { |
| 704 testonly = true | 709 testonly = true |
| 705 configs += [ ":common_config" ] | 710 configs += [ ":common_config" ] |
| 706 public_configs = [ ":common_inherited_config" ] | 711 public_configs = [ ":common_inherited_config" ] |
| 707 sources = [ | 712 sources = [ |
| 708 "video/video_quality_test.cc", | 713 "video/video_quality_test.cc", |
| (...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 801 if (is_ios || (is_mac && target_cpu != "x86")) { | 806 if (is_ios || (is_mac && target_cpu != "x86")) { |
| 802 defines = [ "CARBON_DEPRECATED=YES" ] | 807 defines = [ "CARBON_DEPRECATED=YES" ] |
| 803 } | 808 } |
| 804 if (is_clang) { | 809 if (is_clang) { |
| 805 # Suppress warnings from the Chromium Clang plugin. | 810 # Suppress warnings from the Chromium Clang plugin. |
| 806 # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. | 811 # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. |
| 807 configs -= [ "//build/config/clang:find_bad_constructs" ] | 812 configs -= [ "//build/config/clang:find_bad_constructs" ] |
| 808 } | 813 } |
| 809 } | 814 } |
| 810 } | 815 } |
| OLD | NEW |