Revert of Split out target rtc_media_base from rtc_media

webrtc/media/BUILD.gn

 # Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
 #
 # Use of this source code is governed by a BSD-style license
 # that can be found in the LICENSE file in the root of the source
 # tree. An additional intellectual property rights grant can be found
 # in the file PATENTS.  All contributing project authors may
 # be found in the AUTHORS file in the root of the source tree.
 
 import("//build/config/linux/pkg_config.gni")
 import("../build/webrtc.gni")
 
 group("media") {
   public_deps = [
     ":rtc_media",
-    ":rtc_media_base",
   ]
 }
 
 config("rtc_media_defines_config") {
   defines = [
     "HAVE_WEBRTC_VIDEO",
     "HAVE_WEBRTC_VOICE",
   ]
 }
 
 config("rtc_media_warnings_config") {
   # GN orders flags on a target before flags from configs. The default config
   # adds these flags so to cancel them out they need to come from a config and
   # cannot be on the target directly.
   if (!is_win) {
     cflags = [ "-Wno-deprecated-declarations" ]
   }
 }
 
 if (is_linux && rtc_use_gtk) {
   pkg_config("gtk-lib") {
     packages = [
       "gobject-2.0",
       "gthread-2.0",
       "gtk+-2.0",
     ]
   }
 }
 
-rtc_static_library("rtc_media_base") {
+rtc_static_library("rtc_media") {
   defines = []
   libs = []
   deps = []
   sources = [
     "base/adaptedvideotracksource.cc",
     "base/adaptedvideotracksource.h",
     "base/audiosource.h",
     "base/codec.cc",
     "base/codec.h",
     "base/cryptoparams.h",
@@ skipping 19 matching lines @@
     "base/videobroadcaster.cc",
     "base/videobroadcaster.h",
     "base/videocapturer.cc",
     "base/videocapturer.h",
     "base/videocapturerfactory.h",
     "base/videocommon.cc",
     "base/videocommon.h",
     "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/internalencoderfactory.cc",
     "engine/internalencoderfactory.h",
     "engine/nullwebrtcvideoengine.h",
     "engine/payload_type_mapper.cc",
     "engine/payload_type_mapper.h",
     "engine/simulcast.cc",
     "engine/simulcast.h",
     "engine/videoencodersoftwarefallbackwrapper.cc",
     "engine/videoencodersoftwarefallbackwrapper.h",
     "engine/webrtccommon.h",
@@ skipping 65 matching lines @@
     deps += [ "../modules/video_capture:video_capture_internal_impl" ]
   }
   if (is_linux && rtc_use_gtk) {
     sources += [
       "devices/gtkvideorenderer.cc",
       "devices/gtkvideorenderer.h",
     ]
     public_configs += [ ":gtk-lib" ]
   }
   deps += [
-    ":rtc_media_base",
     "..:webrtc_common",
     "../api:call_api",
     "../base:rtc_base_approved",
     "../call",
     "../modules/audio_mixer:audio_mixer_impl",
     "../modules/video_coding",
+    "../p2p",
     "../system_wrappers",
+    "../video",
     "../voice_engine",
   ]
 }
 
 if (rtc_include_tests) {
   config("rtc_unittest_main_config") {
     # GN orders flags on a target before flags from configs. The default config
     # adds -Wall, and this flag have to be after -Wall -- so they need to
     # come from a config and can"t be on the target directly.
     if (is_clang && is_ios) {
@@ skipping 151 matching lines @@
       # TODO(kjellander): Move as part of work in bugs.webrtc.org/4243.
       ":rtc_media",
       ":rtc_unittest_main",
       "../audio",
       "../base:rtc_base_tests_utils",
       "../modules/audio_device:mock_audio_device",
       "../system_wrappers:metrics_default",
     ]
   }
 }