| 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 274 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 285 } | 285 } |
| 286 } | 286 } |
| 287 | 287 |
| 288 if (!build_with_chromium) { | 288 if (!build_with_chromium) { |
| 289 rtc_executable("webrtc_tests") { | 289 rtc_executable("webrtc_tests") { |
| 290 testonly = true | 290 testonly = true |
| 291 deps = [ | 291 deps = [ |
| 292 ":webrtc", | 292 ":webrtc", |
| 293 "modules/video_capture:video_capture_internal_impl", | 293 "modules/video_capture:video_capture_internal_impl", |
| 294 "test", | 294 "test", |
| 295 "//build/config/sanitizers:deps", | |
| 296 ] | 295 ] |
| 297 } | 296 } |
| 298 | 297 |
| 299 rtc_executable("video_loopback") { | 298 rtc_executable("video_loopback") { |
| 300 testonly = true | 299 testonly = true |
| 301 sources = [ | 300 sources = [ |
| 302 "test/run_test.h", | 301 "test/run_test.h", |
| 303 "video/video_loopback.cc", | 302 "video/video_loopback.cc", |
| 304 ] | 303 ] |
| 305 | 304 |
| 306 if (is_mac) { | 305 if (is_mac) { |
| 307 sources += [ "test/mac/run_test.mm" ] | 306 sources += [ "test/mac/run_test.mm" ] |
| 308 } else { | 307 } else { |
| 309 sources += [ "test/run_test.cc" ] | 308 sources += [ "test/run_test.cc" ] |
| 310 } | 309 } |
| 311 deps = [ | 310 deps = [ |
| 312 ":video_quality_test", | 311 ":video_quality_test", |
| 313 "system_wrappers:metrics_default", | 312 "system_wrappers:metrics_default", |
| 314 "test:field_trial", | 313 "test:field_trial", |
| 315 "test:test_common", | 314 "test:test_common", |
| 316 "test:test_renderer", | 315 "test:test_renderer", |
| 317 "//build/config/sanitizers:deps", | |
| 318 "//testing/gmock", | 316 "//testing/gmock", |
| 319 "//testing/gtest", | 317 "//testing/gtest", |
| 320 "//third_party/gflags", | 318 "//third_party/gflags", |
| 321 ] | 319 ] |
| 322 if (is_clang && !is_nacl) { | 320 if (is_clang && !is_nacl) { |
| 323 # Suppress warnings from Chrome's Clang plugins. | 321 # Suppress warnings from Chrome's Clang plugins. |
| 324 # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. | 322 # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. |
| 325 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] | 323 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] |
| 326 } | 324 } |
| 327 } | 325 } |
| (...skipping 537 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 865 if (is_ios || (is_mac && target_cpu != "x86")) { | 863 if (is_ios || (is_mac && target_cpu != "x86")) { |
| 866 defines = [ "CARBON_DEPRECATED=YES" ] | 864 defines = [ "CARBON_DEPRECATED=YES" ] |
| 867 } | 865 } |
| 868 if (is_clang) { | 866 if (is_clang) { |
| 869 # Suppress warnings from the Chromium Clang plugin. | 867 # Suppress warnings from the Chromium Clang plugin. |
| 870 # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. | 868 # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. |
| 871 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] | 869 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] |
| 872 } | 870 } |
| 873 } | 871 } |
| 874 } | 872 } |
| OLD | NEW |