commit ad62792c5dc49c896df56ab1319b5b8556af875a
author Mirko Bonadei <mbonadei@webrtc.org> Thu Nov 30 16:16:21 2017
committer Commit Bot <commit-bot@chromium.org> Fri Dec 01 09:30:11 2017
tree aa244f38d7d547eeaea289e6c34178e20de56fa7
parent 8e28c56a301c338fb1e520b6aad94aec0c160a93

Fixing hidden dependencies.

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}

call/BUILD.gn

diff --git a/call/BUILD.gn b/call/BUILD.gn
index 7404504..0b83d11 100644
--- a/call/BUILD.gn
+++ b/call/BUILD.gn
@@ -154,6 +154,12 @@
 }
 
 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",

common_video/BUILD.gn

diff --git a/common_video/BUILD.gn b/common_video/BUILD.gn
index 669fa7a..c4b810e 100644
--- a/common_video/BUILD.gn
+++ b/common_video/BUILD.gn
@@ -16,6 +16,13 @@
 }
 
 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",

media/BUILD.gn

diff --git a/media/BUILD.gn b/media/BUILD.gn
index f59cbb6..e24c8cf 100644
--- a/media/BUILD.gn
+++ b/media/BUILD.gn
@@ -86,13 +86,11 @@
     "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) {

modules/video_capture/BUILD.gn

diff --git a/modules/video_capture/BUILD.gn b/modules/video_capture/BUILD.gn
index 31a4b65..9a44967 100644
--- a/modules/video_capture/BUILD.gn
+++ b/modules/video_capture/BUILD.gn
@@ -30,6 +30,7 @@
     "../..:webrtc_common",
     "../../api:video_frame_api_i420",
     "../../common_video",
+    "../../media:rtc_media_base",
     "../../rtc_base:rtc_base_approved",
     "../../system_wrappers",
   ]

test/BUILD.gn

diff --git a/test/BUILD.gn b/test/BUILD.gn
index 7eb896d..c9f8cfc 100644
--- a/test/BUILD.gn
+++ b/test/BUILD.gn
@@ -566,6 +566,7 @@
     "../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 @@
     ":test_support",
     "..:webrtc_common",
     "../common_video",
+    "../media:rtc_media_base",
     "../modules/media_file",
     "../rtc_base:rtc_base_approved",
     "//testing/gtest",