Chromium Code Reviews| 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 275 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 286 if (!build_with_chromium) { | 286 if (!build_with_chromium) { |
| 287 rtc_executable("webrtc_tests") { | 287 rtc_executable("webrtc_tests") { |
| 288 testonly = true | 288 testonly = true |
| 289 deps = [ | 289 deps = [ |
| 290 ":webrtc", | 290 ":webrtc", |
| 291 "modules/video_capture:video_capture_internal_impl", | 291 "modules/video_capture:video_capture_internal_impl", |
| 292 "test", | 292 "test", |
| 293 ] | 293 ] |
| 294 } | 294 } |
| 295 | 295 |
| 296 rtc_executable("video_loopback") { | 296 if (rtc_include_tests) { |
| 297 testonly = true | 297 rtc_executable("video_loopback") { |
| 298 sources = [ | 298 testonly = true |
|
kjellander_webrtc
2016/09/13 09:21:25
Please move this target down to the already existi
charujain
2016/09/13 11:26:55
Done.
| |
| 299 "test/run_test.h", | 299 sources = [ |
| 300 "video/video_loopback.cc", | 300 "test/run_test.h", |
| 301 ] | 301 "video/video_loopback.cc", |
| 302 ] | |
| 302 | 303 |
| 303 if (is_mac) { | 304 if (is_mac) { |
| 304 sources += [ "test/mac/run_test.mm" ] | 305 sources += [ "test/mac/run_test.mm" ] |
| 305 } else { | 306 } else { |
| 306 sources += [ "test/run_test.cc" ] | 307 sources += [ "test/run_test.cc" ] |
| 307 } | 308 } |
| 308 deps = [ | 309 deps = [ |
| 309 ":video_quality_test", | 310 ":video_quality_test", |
| 310 "system_wrappers:metrics_default", | 311 "system_wrappers:metrics_default", |
| 311 "test:field_trial", | 312 "test:field_trial", |
| 312 "test:test_common", | 313 "test:test_common", |
| 313 "test:test_renderer", | 314 "test:test_renderer", |
| 314 "//testing/gmock", | 315 "//testing/gmock", |
| 315 "//testing/gtest", | 316 "//testing/gtest", |
| 316 "//third_party/gflags", | 317 "//third_party/gflags", |
| 317 ] | 318 ] |
| 318 if (is_clang && !is_nacl) { | 319 if (is_clang && !is_nacl) { |
| 319 # Suppress warnings from Chrome's Clang plugins. | 320 # Suppress warnings from Chrome's Clang plugins. |
| 320 # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. | 321 # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. |
| 321 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] | 322 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] |
| 323 } | |
| 322 } | 324 } |
| 323 } | 325 } |
| 324 } | 326 } |
| 325 | 327 |
| 326 rtc_source_set("webrtc_common") { | 328 rtc_source_set("webrtc_common") { |
| 327 sources = [ | 329 sources = [ |
| 328 "common_types.cc", | 330 "common_types.cc", |
| 329 "common_types.h", | 331 "common_types.h", |
| 330 "config.cc", | 332 "config.cc", |
| 331 "config.h", | 333 "config.h", |
| (...skipping 489 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 821 if (is_mac) { | 823 if (is_mac) { |
| 822 sources += [ "base/macsocketserver_unittest.cc" ] | 824 sources += [ "base/macsocketserver_unittest.cc" ] |
| 823 } | 825 } |
| 824 if (is_clang) { | 826 if (is_clang) { |
| 825 # Suppress warnings from the Chromium Clang plugin. | 827 # Suppress warnings from the Chromium Clang plugin. |
| 826 # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. | 828 # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. |
| 827 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] | 829 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] |
| 828 } | 830 } |
| 829 } | 831 } |
| 830 } | 832 } |
| OLD | NEW |