commit a8005cfd8b825b1f15981559c41f8d05222cd674
author Patrik Höglund <phoglund@webrtc.org> Wed Dec 13 16:05:42 2017 +0100
committer Commit Bot <commit-bot@chromium.org> Thu Dec 14 06:49:11 2017 +0000
tree cc5ab2db0409875401e3a44bed3752e026e0585d
parent 62a8b620bde313fc08a494b767749335d0d7ba52

Fix circular dependencies between optional, array_view, and rtc_base.

This splits things out of rtc_base and makes dependencies explicit.

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

sdk/BUILD.gn

diff --git a/sdk/BUILD.gn b/sdk/BUILD.gn
index 544c112..9161a29 100644
--- a/sdk/BUILD.gn
+++ b/sdk/BUILD.gn
@@ -68,6 +68,7 @@
     ]
 
     deps = [
+      "../rtc_base:checks",
       "../rtc_base:rtc_base",
     ]
     configs += [ "..:common_objc" ]
@@ -105,6 +106,7 @@
 
       deps = [
         ":common_objc",
+        "../rtc_base:checks",
         "../rtc_base:rtc_base_approved",
       ]
 
@@ -138,6 +140,7 @@
         "../api:video_frame_api_i420",
         "../common_video",
         "../media:rtc_media_base",
+        "../rtc_base:checks",
         "../rtc_base:rtc_base",
       ]
 
@@ -195,6 +198,7 @@
         "../api:optional",
         "../common_video",
         "../media:rtc_media_base",
+        "../rtc_base:checks",
         "../rtc_base:rtc_base",
       ]
 
@@ -259,6 +263,7 @@
         deps = [
           ":video_objc",
           "../api:video_frame_api",
+          "../rtc_base:checks",
           "../rtc_base:rtc_base_approved",
         ]
         configs += [ "..:common_objc" ]
@@ -515,6 +520,7 @@
         "../media:rtc_media_base",
         "../modules:module_api",
         "../pc:peerconnection",
+        "../rtc_base:checks",
         "../rtc_base:rtc_base",
       ]
     }
@@ -770,6 +776,7 @@
         "$rtc_libyuv_dir",
         "../api:video_frame_api_i420",
         "../common_video",
+        "../rtc_base:checks",
         "../rtc_base:rtc_base_approved",
       ]
 
@@ -794,6 +801,7 @@
         "../common_video",
         "../modules:module_api",
         "../modules/video_coding:webrtc_h264",
+        "../rtc_base:checks",
         "../rtc_base:rtc_base_approved",
       ]
       if (!build_with_chromium && is_clang) {
@@ -829,6 +837,7 @@
         "../modules:module_api",
         "../modules/video_coding:video_coding_utility",
         "../modules/video_coding:webrtc_h264",
+        "../rtc_base:checks",
         "../rtc_base:rtc_base_approved",
         "../system_wrappers",
       ]