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 278 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 289 executable("webrtc_tests") { | 289 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 ] | 295 ] |
| 296 } | 296 } |
| 297 } | 297 } |
| 298 | 298 |
| 299 if (!build_with_chromium) { | |
| 300 executable("video_loopback") { | |
|
kjellander_webrtc
2016/08/10 14:46:50
Put this new target inside the existing if (!build
stefan-webrtc
2016/08/11 10:38:35
Done.
| |
| 301 testonly = true | |
| 302 sources = [ | |
| 303 "test/mac/run_test.mm", | |
| 304 "test/run_test.cc", | |
| 305 "test/run_test.h", | |
| 306 "video/video_loopback.cc", | |
| 307 ] | |
| 308 | |
| 309 if (is_mac) { | |
| 310 sources -= [ "test/run_test.cc" ] | |
|
kjellander_webrtc
2016/08/10 14:46:49
GN disencourages use of negative source entries. C
stefan-webrtc
2016/08/11 10:38:35
Done.
| |
| 311 } | |
| 312 deps = [ | |
| 313 ":video_quality_test", | |
| 314 ":webrtc", | |
|
kjellander_webrtc
2016/08/10 14:46:50
Is there a way to not depend on the monolith targe
stefan-webrtc
2016/08/11 10:38:35
Changed to call:call
| |
| 315 "modules/video_capture:video_capture_internal_impl", | |
|
kjellander_webrtc
2016/08/10 14:46:49
Please add the added dependencies to GYP as well t
stefan-webrtc
2016/08/11 10:38:35
Done.
| |
| 316 "system_wrappers:metrics_default", | |
| 317 "test:field_trial", | |
| 318 "test:test_common", | |
| 319 "test:test_renderer", | |
| 320 "//testing/gmock", | |
| 321 "//testing/gtest", | |
| 322 "//third_party/gflags", | |
| 323 ] | |
| 324 if (is_clang && !is_nacl) { | |
| 325 # Suppress warnings from Chrome's Clang plugins. | |
| 326 # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. | |
| 327 configs -= [ "//build/config/clang:find_bad_constructs" ] | |
|
kjellander_webrtc
2016/08/10 14:46:50
Could you try fixing these warnings instead of hav
stefan-webrtc
2016/08/11 10:38:35
I prefer not to in this case since it means I'll h
kjellander_webrtc
2016/08/15 11:27:38
Fair enough.
| |
| 328 } | |
| 329 } | |
| 330 } | |
| 331 | |
| 299 source_set("webrtc_common") { | 332 source_set("webrtc_common") { |
| 300 sources = [ | 333 sources = [ |
| 301 "audio_sink.h", | 334 "audio_sink.h", |
| 302 "common_types.cc", | 335 "common_types.cc", |
| 303 "common_types.h", | 336 "common_types.h", |
| 304 "config.cc", | 337 "config.cc", |
| 305 "config.h", | 338 "config.h", |
| 306 "engine_configurations.h", | 339 "engine_configurations.h", |
| 307 "typedefs.h", | 340 "typedefs.h", |
| 308 ] | 341 ] |
| (...skipping 457 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 766 if (is_ios || (is_mac && target_cpu != "x86")) { | 799 if (is_ios || (is_mac && target_cpu != "x86")) { |
| 767 defines = [ "CARBON_DEPRECATED=YES" ] | 800 defines = [ "CARBON_DEPRECATED=YES" ] |
| 768 } | 801 } |
| 769 if (is_clang) { | 802 if (is_clang) { |
| 770 # Suppress warnings from the Chromium Clang plugin. | 803 # Suppress warnings from the Chromium Clang plugin. |
| 771 # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. | 804 # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. |
| 772 configs -= [ "//build/config/clang:find_bad_constructs" ] | 805 configs -= [ "//build/config/clang:find_bad_constructs" ] |
| 773 } | 806 } |
| 774 } | 807 } |
| 775 } | 808 } |
| OLD | NEW |