Split out target rtc_media_base from rtc_media

webrtc/media/BUILD.gn

Index: webrtc/media/BUILD.gn
diff --git a/webrtc/media/BUILD.gn b/webrtc/media/BUILD.gn
index c3c456c2977887c793537306f0c5f0a665d85111..0408faaa973bcf337016c4b5871582b9c559e4df 100644
--- a/webrtc/media/BUILD.gn
+++ b/webrtc/media/BUILD.gn
@@ -12,6 +12,7 @@ import("../build/webrtc.gni")
 group("media") {
   public_deps = [
     ":rtc_media",
+    ":rtc_media_base",
   ]
 }
 
@@ -41,7 +42,7 @@ if (is_linux && rtc_use_gtk) {
   }
 }
 
-rtc_static_library("rtc_media") {
+rtc_static_library("rtc_media_base") {
   defines = []
   libs = []
   deps = []
@@ -81,6 +82,38 @@ rtc_static_library("rtc_media") {
     "base/videoframe.h",
     "base/videosourcebase.cc",
     "base/videosourcebase.h",
+  ]
+
+  configs += [ ":rtc_media_warnings_config" ]
+
+  if (!build_with_chromium && is_clang) {
+    # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
+    suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
+  }
+
+  include_dirs = []
+  if (rtc_build_libyuv) {
+    deps += [ "$rtc_libyuv_dir" ]
+    public_deps = [
+      "$rtc_libyuv_dir",
+    ]
+  } else {
+    # Need to add a directory normally exported by libyuv.
+    include_dirs += [ "$rtc_libyuv_dir/include" ]
+  }
+
+  deps += [
+    "..:webrtc_common",
+    "../base:rtc_base_approved",
+    "../p2p",
+  ]
+}
+
+rtc_static_library("rtc_media") {
+  defines = []
+  libs = []
+  deps = []
+  sources = [
     "engine/nullwebrtcvideoengine.h",
     "engine/payload_type_mapper.cc",
     "engine/payload_type_mapper.h",
@@ -164,14 +197,13 @@ rtc_static_library("rtc_media") {
     public_configs += [ ":gtk-lib" ]
   }
   deps += [
+    ":rtc_media_base",
     "..:webrtc_common",
     "../api:call_api",
     "../base:rtc_base_approved",
     "../call",
     "../modules/video_coding",
-    "../p2p",
     "../system_wrappers",
-    "../video",

[kjellander_webrtc, 2016/11/17 14:58:42]

So video wasn't really needed?

[magjed_webrtc, 2016/11/17 15:12:49]

No. There is no includes of webrtc/video/ at all in the webrtc/media folder, so
I removed it. p2p is only used from webrtc/media/base so I have it there.

     "../voice_engine",
   ]
 }