Chromium Code Reviews| Index: webrtc/BUILD.gn |
| diff --git a/webrtc/BUILD.gn b/webrtc/BUILD.gn |
| index c33055ce76cedc6c76c795c1fbf5a3aff4c73142..3df0739f70690d33d533778ad6083cca4d96f017 100644 |
| --- a/webrtc/BUILD.gn |
| +++ b/webrtc/BUILD.gn |
| @@ -283,46 +283,6 @@ if (!is_ios || !build_with_chromium) { |
| } |
| } |
| -if (!build_with_chromium) { |
| - rtc_executable("webrtc_tests") { |
| - testonly = true |
| - deps = [ |
| - ":webrtc", |
| - "modules/video_capture:video_capture_internal_impl", |
| - "test", |
| - ] |
| - } |
| - |
| - rtc_executable("video_loopback") { |
| - testonly = true |
| - sources = [ |
| - "test/run_test.h", |
| - "video/video_loopback.cc", |
| - ] |
| - |
| - if (is_mac) { |
| - sources += [ "test/mac/run_test.mm" ] |
| - } else { |
| - sources += [ "test/run_test.cc" ] |
| - } |
| - deps = [ |
| - ":video_quality_test", |
| - "system_wrappers:metrics_default", |
| - "test:field_trial", |
| - "test:test_common", |
| - "test:test_renderer", |
| - "//testing/gmock", |
| - "//testing/gtest", |
| - "//third_party/gflags", |
| - ] |
| - if (is_clang && !is_nacl) { |
| - # Suppress warnings from Chrome's Clang plugins. |
| - # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. |
| - suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] |
| - } |
| - } |
| -} |
| - |
| rtc_source_set("webrtc_common") { |
| sources = [ |
| "common_types.cc", |
| @@ -749,6 +709,46 @@ if (rtc_include_tests) { |
| } |
| } |
| + if (!build_with_chromium) { |
|
kjellander_webrtc
2016/09/13 11:30:51
Please remove the whole if(!build_with_chromium) b
|
| + rtc_executable("webrtc_tests") { |
| + testonly = true |
| + deps = [ |
| + ":webrtc", |
| + "modules/video_capture:video_capture_internal_impl", |
| + "test", |
| + ] |
| + } |
| + |
| + rtc_executable("video_loopback") { |
| + testonly = true |
| + sources = [ |
| + "test/run_test.h", |
| + "video/video_loopback.cc", |
| + ] |
| + |
| + if (is_mac) { |
| + sources += [ "test/mac/run_test.mm" ] |
| + } else { |
| + sources += [ "test/run_test.cc" ] |
| + } |
| + deps = [ |
| + ":video_quality_test", |
| + "system_wrappers:metrics_default", |
| + "test:field_trial", |
| + "test:test_common", |
| + "test:test_renderer", |
| + "//testing/gmock", |
| + "//testing/gtest", |
| + "//third_party/gflags", |
| + ] |
| + if (is_clang && !is_nacl) { |
| + # Suppress warnings from Chrome's Clang plugins. |
| + # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. |
| + suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] |
| + } |
| + } |
| + } |
| + |
| rtc_test("webrtc_perf_tests") { |
| testonly = true |
| configs += [ ":rtc_unittests_config" ] |