Index: webrtc/media/BUILD.gn |
diff --git a/webrtc/media/BUILD.gn b/webrtc/media/BUILD.gn |
index 695cb8d5d0ffcd855f1e27fb6c99012cccae2144..590450bd296f0ab0ff97ab4e63e86b9a08ea423d 100644 |
--- a/webrtc/media/BUILD.gn |
+++ b/webrtc/media/BUILD.gn |
@@ -12,7 +12,6 @@ |
group("media") { |
public_deps = [ |
":rtc_media", |
- ":rtc_media_base", |
] |
} |
@@ -42,7 +41,7 @@ |
} |
} |
-rtc_static_library("rtc_media_base") { |
+rtc_static_library("rtc_media") { |
defines = [] |
libs = [] |
deps = [] |
@@ -82,38 +81,6 @@ |
"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", |
@@ -199,14 +166,15 @@ |
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", |
] |
} |