commit aba85d1f5326621f395427f13cd650a063048d96
author Patrik Höglund <phoglund@webrtc.org> Tue Nov 28 14:46:08 2017
committer Commit Bot <commit-bot@chromium.org> Tue Nov 28 15:28:58 2017
tree 437415ca46e4588a89e057f73e2f398b74d3626e
parent b874a352272aa7f35e63d0080ca807057f821584

Resolve circular dependency in rtc_media_base.

This one was pretty straightforward fortunately.

Bug: webrtc:6828
Change-Id: Ie7b5e71f1298c409dbca2c74eaa09c0986e41d8f
Reviewed-on: https://webrtc-review.googlesource.com/25821
Commit-Queue: Patrik Höglund <phoglund@webrtc.org>
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#20914}

media/BUILD.gn

diff --git a/media/BUILD.gn b/media/BUILD.gn
index 4ff272f..f59cbb6 100644
--- a/media/BUILD.gn
+++ b/media/BUILD.gn
@@ -52,13 +52,6 @@
 }
 
 rtc_static_library("rtc_media_base") {
-  # TODO(kjellander): Remove (bugs.webrtc.org/6828)
-  # Enabling GN check triggers cyclic dependency error:
-  #   :rtc_media_base ->
-  #   ../pc:rtc_pc_base ->
-  #   :rtc_data ->
-  #   :rtc_media_base
-  check_includes = false
   defines = []
   libs = []
   deps = []
@@ -119,9 +112,18 @@
   deps += [
     "..:webrtc_common",
     "../api:libjingle_peerconnection_api",
+    "../api:optional",
+    "../api:video_frame_api",
+    "../api:video_frame_api_i420",
+    "../api/audio_codecs:audio_codecs_api",
+    "../api/video_codecs:video_codecs_api",
+    "../call:call_interfaces",
+    "../call:video_stream_api",
+    "../modules/audio_processing:audio_processing_statistics",
     "../p2p",
     "../rtc_base:rtc_base",
     "../rtc_base:rtc_base_approved",
+    "../system_wrappers:field_trial_api",
   ]
 
   public_deps += [ ":rtc_h264_profile_id" ]