From 0594a7ca5d9e63da7993239f58871d28665848ab Mon Sep 17 00:00:00 2001 From: Mirko Bonadei Date: Mon, 18 Dec 2017 11:42:48 +0100 Subject: [PATCH] Stop using public_deps in common_video/. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bug: webrtc:8603 Change-Id: I467f07a6bd07585455d1d1f9e8bcfa59f0dce9f0 Reviewed-on: https://webrtc-review.googlesource.com/34185 Reviewed-by: Patrik Höglund Commit-Queue: Mirko Bonadei Cr-Commit-Position: refs/heads/master@{#21359} --- common_video/BUILD.gn | 5 ++--- modules/rtp_rtcp/BUILD.gn | 2 ++ modules/video_capture/BUILD.gn | 2 ++ modules/video_coding/BUILD.gn | 4 ++++ sdk/BUILD.gn | 2 ++ test/BUILD.gn | 1 + video/BUILD.gn | 1 + 7 files changed, 14 insertions(+), 3 deletions(-) diff --git a/common_video/BUILD.gn b/common_video/BUILD.gn index 07733db14a..264aed41eb 100644 --- a/common_video/BUILD.gn +++ b/common_video/BUILD.gn @@ -62,6 +62,7 @@ rtc_static_library("common_video") { deps = [ "..:webrtc_common", "../api:optional", + "../api:video_frame_api", "../api:video_frame_api_i420", "../media:rtc_h264_profile_id", "../modules:module_api", @@ -69,9 +70,6 @@ rtc_static_library("common_video") { "../rtc_base:rtc_task_queue", "../system_wrappers", ] - public_deps = [ - "../api:video_frame_api", - ] } if (rtc_include_tests) { @@ -112,6 +110,7 @@ if (rtc_include_tests) { deps = [ ":common_video", + "../api:video_frame_api", "../api:video_frame_api_i420", "../modules/video_capture:video_capture", "../rtc_base:rtc_base", diff --git a/modules/rtp_rtcp/BUILD.gn b/modules/rtp_rtcp/BUILD.gn index 4ae32cd92c..efa36a12b2 100644 --- a/modules/rtp_rtcp/BUILD.gn +++ b/modules/rtp_rtcp/BUILD.gn @@ -86,6 +86,7 @@ rtc_source_set("rtp_rtcp_format") { "../../api:array_view", "../../api:libjingle_peerconnection_api", "../../api:optional", + "../../api:video_frame_api", "../../api/audio_codecs:audio_codecs_api", "../../common_video", "../../rtc_base:checks", @@ -408,6 +409,7 @@ if (rtc_include_tests) { "../../api:libjingle_peerconnection_api", "../../api:optional", "../../api:transport_api", + "../../api:video_frame_api", "../../call:rtp_receiver", "../../common_video:common_video", "../../logging:rtc_event_log_api", diff --git a/modules/video_capture/BUILD.gn b/modules/video_capture/BUILD.gn index 2953053395..b71beac528 100644 --- a/modules/video_capture/BUILD.gn +++ b/modules/video_capture/BUILD.gn @@ -29,6 +29,7 @@ rtc_static_library("video_capture_module") { "..:module_api", "../..:webrtc_common", "../../:typedefs", + "../../api:video_frame_api", "../../api:video_frame_api_i420", "../../common_video", "../../media:rtc_media_base", @@ -206,6 +207,7 @@ if (!build_with_chromium) { deps = [ ":video_capture_internal_impl", ":video_capture_module", + "../../api:video_frame_api", "../../api:video_frame_api_i420", "../../common_video:common_video", "../../rtc_base:rtc_base_approved", diff --git a/modules/video_coding/BUILD.gn b/modules/video_coding/BUILD.gn index 3751eb0d33..71e9333bde 100644 --- a/modules/video_coding/BUILD.gn +++ b/modules/video_coding/BUILD.gn @@ -102,6 +102,7 @@ rtc_static_library("video_coding") { "../..:webrtc_common", "../../:typedefs", "../../api:optional", + "../../api:video_frame_api", "../../api:video_frame_api_i420", "../../call:video_stream_api", "../../common_video", @@ -270,6 +271,7 @@ rtc_static_library("webrtc_stereo") { ":video_coding_utility", "..:module_api", "../..:webrtc_common", + "../../api:video_frame_api", "../../api:video_frame_api_i420", "../../api/video_codecs:video_codecs_api", "../../common_video:common_video", @@ -308,6 +310,7 @@ rtc_static_library("webrtc_vp8") { "../..:webrtc_common", "../../:typedefs", "../../api:optional", + "../../api:video_frame_api", "../../api/video_codecs:video_codecs_api", "../../common_video", "../../rtc_base:checks", @@ -438,6 +441,7 @@ if (rtc_include_tests) { ":webrtc_vp8", "../..:webrtc_common", "../../:typedefs", + "../../api:video_frame_api", "../../api:video_frame_api_i420", "../../api/video_codecs:video_codecs_api", "../../common_video:common_video", diff --git a/sdk/BUILD.gn b/sdk/BUILD.gn index d8d4b7b7d6..95ba7563dd 100644 --- a/sdk/BUILD.gn +++ b/sdk/BUILD.gn @@ -196,6 +196,7 @@ if (is_ios || is_mac) { ":videotracksource_objc", "../api:libjingle_peerconnection_api", "../api:optional", + "../api:video_frame_api", "../common_video", "../media:rtc_media_base", "../rtc_base:checks", @@ -828,6 +829,7 @@ if (is_ios || is_mac) { ":video_objc", ":video_toolbox_cc", ":videotracksource_objc", + "../api:video_frame_api", "../api/video_codecs:video_codecs_api", "../common_video", "../media:rtc_media", diff --git a/test/BUILD.gn b/test/BUILD.gn index caf3e30fdc..ab31e99bb4 100644 --- a/test/BUILD.gn +++ b/test/BUILD.gn @@ -62,6 +62,7 @@ rtc_source_set("video_test_common") { "..:webrtc_common", "../:typedefs", "../api:optional", + "../api:video_frame_api", "../api:video_frame_api_i420", "../api/video_codecs:video_codecs_api", "../call:video_stream_api", diff --git a/video/BUILD.gn b/video/BUILD.gn index fe03c9add4..83d56874e4 100644 --- a/video/BUILD.gn +++ b/video/BUILD.gn @@ -58,6 +58,7 @@ rtc_static_library("video") { "../:typedefs", "../api:optional", "../api:transport_api", + "../api:video_frame_api", "../api:video_frame_api_i420", "../api/video_codecs:video_codecs_api", "../call:bitrate_allocator",