Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1018)

Unified Diff: webrtc/media/BUILD.gn

Issue 2509123003: Reland of Split out target rtc_media_base from rtc_media (Closed)
Patch Set: Remove dependency to libyuv Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | webrtc/media/base/codec.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/media/BUILD.gn
diff --git a/webrtc/media/BUILD.gn b/webrtc/media/BUILD.gn
index 8ed07b14a5572e8562f3ee0b10c4e1dfd5d55fa2..75f1a317766fddddd2614f53d3ec286aacc270ed 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,60 @@ 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 = [
+ # TODO(magjed): Remove base header files once Chromium is updated.
+ "base/adaptedvideotracksource.h",
+ "base/audiosource.h",
+ "base/codec.h",
+ "base/cryptoparams.h",
+ "base/device.h",
+ "base/hybriddataengine.h",
+ "base/mediachannel.h",
+ "base/mediaconstants.h",
+ "base/mediaengine.h",
+ "base/rtpdataengine.h",
+ "base/rtpdump.h",
+ "base/rtputils.h",
+ "base/streamparams.h",
+ "base/turnutils.h",
+ "base/videoadapter.h",
+ "base/videobroadcaster.h",
+ "base/videocapturer.h",
+ "base/videocapturerfactory.h",
+ "base/videocommon.h",
+ "base/videoframe.h",
+ "base/videosourcebase.h",
"engine/internalencoderfactory.cc",
"engine/internalencoderfactory.h",
"engine/nullwebrtcvideoengine.h",
@@ -168,15 +223,14 @@ rtc_static_library("rtc_media") {
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",
]
}
« no previous file with comments | « no previous file | webrtc/media/base/codec.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698