Fixed video_loopback target.
Moved it inside the rtc_include_tests if clause so that it build only when tests flag is set to true. NOTRY=True BUG=31425205 Review-Url: https://codereview.webrtc.org/2337463002 Cr-Commit-Position: refs/heads/master@{#14197}
This commit is contained in:
parent
2b2779f3f1
commit
bb723e53b4
@ -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,44 @@ if (rtc_include_tests) {
|
||||
}
|
||||
}
|
||||
|
||||
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" ]
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user