zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup video test target dependencies in video_test_common.

Browse Source 
The purpose is to fix (Asan discovered) duble definitions in upstream project.

BUG=none

Review-Url: https://codereview.webrtc.org/2721303002
Cr-Commit-Position: refs/heads/master@{#16939}
This commit is contained in:
perkj
2017-03-01 03:37:08 -08:00
committed by Commit bot
parent a67e5f5de9
commit c5726c1579
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
webrtc/test/BUILD.gn
View File

@ -52,7 +52,6 @@ rtc_source_set("video_test_common") {
} }
deps = [ deps = [
":video_test_support",
"../common_video", "../common_video",
"../modules/video_capture:video_capture_module", "../modules/video_capture:video_capture_module",
] ]
@ -292,10 +291,12 @@ rtc_test("test_support_unittests") {
} }
deps += [ deps += [
":direct_transport",
":fileutils_unittests", ":fileutils_unittests",
":test_common", ":test_common",
":test_main", ":test_main",
":video_test_common", ":video_test_common",
":video_test_support",
"../modules/video_capture", "../modules/video_capture",
"//testing/gmock", "//testing/gmock",
"//testing/gtest", "//testing/gtest",
@ -396,6 +397,7 @@ rtc_source_set("test_common") {
":fake_audio_device", ":fake_audio_device",
":rtp_test_utils", ":rtp_test_utils",
":test_support", ":test_support",
":video_test_common",
"..:webrtc_common", "..:webrtc_common",
"../audio", "../audio",
"../base:rtc_base_approved", "../base:rtc_base_approved",
@ -475,7 +477,6 @@ rtc_source_set("test_renderer") {
deps = [ deps = [
":test_support", ":test_support",
":video_test_common",
"../modules/media_file", "../modules/media_file",
"//testing/gtest", "//testing/gtest",
] ]

1
webrtc/video/BUILD.gn
View File

@ -91,6 +91,7 @@ if (rtc_include_tests) {
"../system_wrappers", "../system_wrappers",
"//testing/gtest", "//testing/gtest",
"//webrtc/test:test_renderer", "//webrtc/test:test_renderer",
"//webrtc/test:video_test_common",
] ]
if (!is_android) { if (!is_android) {
deps += [ "../modules/video_capture:video_capture_internal_impl" ] deps += [ "../modules/video_capture:video_capture_internal_impl" ]