From c5726c1579358260a7587ed05943f01dba506fa6 Mon Sep 17 00:00:00 2001 From: perkj Date: Wed, 1 Mar 2017 03:37:08 -0800 Subject: [PATCH] Cleanup video test target dependencies in video_test_common. 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} --- webrtc/test/BUILD.gn | 5 +++-- webrtc/video/BUILD.gn | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/webrtc/test/BUILD.gn b/webrtc/test/BUILD.gn index 12eb3cacc3..267d1e2d05 100644 --- a/webrtc/test/BUILD.gn +++ b/webrtc/test/BUILD.gn @@ -52,7 +52,6 @@ rtc_source_set("video_test_common") { } deps = [ - ":video_test_support", "../common_video", "../modules/video_capture:video_capture_module", ] @@ -292,10 +291,12 @@ rtc_test("test_support_unittests") { } deps += [ + ":direct_transport", ":fileutils_unittests", ":test_common", ":test_main", ":video_test_common", + ":video_test_support", "../modules/video_capture", "//testing/gmock", "//testing/gtest", @@ -396,6 +397,7 @@ rtc_source_set("test_common") { ":fake_audio_device", ":rtp_test_utils", ":test_support", + ":video_test_common", "..:webrtc_common", "../audio", "../base:rtc_base_approved", @@ -475,7 +477,6 @@ rtc_source_set("test_renderer") { deps = [ ":test_support", - ":video_test_common", "../modules/media_file", "//testing/gtest", ] diff --git a/webrtc/video/BUILD.gn b/webrtc/video/BUILD.gn index a5a3b7c2dd..5859c12ef8 100644 --- a/webrtc/video/BUILD.gn +++ b/webrtc/video/BUILD.gn @@ -91,6 +91,7 @@ if (rtc_include_tests) { "../system_wrappers", "//testing/gtest", "//webrtc/test:test_renderer", + "//webrtc/test:video_test_common", ] if (!is_android) { deps += [ "../modules/video_capture:video_capture_internal_impl" ]