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

Fixing hidden dependencies.

Browse Source 
Header files base/videosinkinterface.h and base/videosourceinterface.h
were not part of any target (because they cause 2 dependency cycles).

This CL uncomment them so GN can keep dependencies under control, the
2 dependency cycles will be removed as part of webrtc:6828.

Bug: webrtc:6828
Change-Id: I5c5580facc010ba619e105a9b8a572ac70169a01
Reviewed-on: https://webrtc-review.googlesource.com/27621
Reviewed-by: Patrik Höglund <phoglund@webrtc.org>
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#20970}
This commit is contained in:
Mirko Bonadei
2017-11-30 17:16:21 +01:00
committed by Commit Bot
parent 8e28c56a30
commit ad62792c5d
5 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
call/BUILD.gn
View File

@ -154,6 +154,12 @@ rtc_static_library("call") {
}
rtc_source_set("video_stream_api") {
# TODO(bugs.webrtc.org/6828): Remove dependency cycle:
# //call:video_stream_api ->
# //media:rtc_media_base ->
# //call:call_interfaces ->
# //call:video_stream_api
check_includes = false
sources = [
"video_config.cc",
"video_config.h",

7
common_video/BUILD.gn
View File

@ -16,6 +16,13 @@ config("common_video_config") {
}
rtc_static_library("common_video") {
# TODO(bugs.webrtc.org/6828): Remove dependency cycle:
# //common_video:common_video ->
# //media:rtc_media_base ->
# //call:call_interfaces ->
# //call:video_stream_api ->
# //common_video:common_video
check_includes = false
sources = [
"bitrate_adjuster.cc",
"h264/h264_bitstream_parser.cc",

6
media/BUILD.gn
View File

@ -86,13 +86,11 @@ rtc_static_library("rtc_media_base") {
"base/videocapturerfactory.h",
"base/videocommon.cc",
"base/videocommon.h",
"base/videosinkinterface.h",
"base/videosourcebase.cc",
"base/videosourcebase.h",
# TODO(aleloi): add "base/videosinkinterface.h"
"base/videosourceinterface.cc",
# TODO(aleloi): add "base/videosourceinterface.h"
"base/videosourceinterface.h",
]
if (!build_with_chromium && is_clang) {

1
modules/video_capture/BUILD.gn
View File

@ -30,6 +30,7 @@ rtc_static_library("video_capture_module") {
"../..:webrtc_common",
"../../api:video_frame_api_i420",
"../../common_video",
"../../media:rtc_media_base",
"../../rtc_base:rtc_base_approved",
"../../system_wrappers",
]

2
test/BUILD.gn
View File

@ -566,6 +566,7 @@ rtc_source_set("test_common") {
"../call:video_stream_api",
"../common_video",
"../logging:rtc_event_log_api",
"../media:rtc_media_base",
"../modules/audio_device:mock_audio_device",
"../modules/audio_mixer:audio_mixer_impl",
"../modules/audio_processing",
@ -653,6 +654,7 @@ rtc_source_set("test_renderer_generic") {
":test_support",
"..:webrtc_common",
"../common_video",
"../media:rtc_media_base",
"../modules/media_file",
"../rtc_base:rtc_base_approved",
"//testing/gtest",