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

Unified Diff: media/BUILD.gn

Issue 2572883002: Convert USE_PROPRIETARY_CODECS to a buildflag header. (Closed)
Patch Set: Merge Created 4 years 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
Index: media/BUILD.gn
diff --git a/media/BUILD.gn b/media/BUILD.gn
index 279eab9bd6e88635fb965707e1c7d4a31057f503..6804b04e63e618b1b989236e8b167275aa7b566d 100644
--- a/media/BUILD.gn
+++ b/media/BUILD.gn
@@ -25,6 +25,7 @@ buildflag_header("media_features") {
"ENABLE_MSE_MPEG2TS_STREAM_PARSER=$enable_mse_mpeg2ts_stream_parser",
"ENABLE_MEDIA_REMOTING=$enable_media_remoting",
"ENABLE_WEBRTC=$enable_webrtc",
+ "USE_PROPRIETARY_CODECS=$proprietary_codecs",
]
}
@@ -274,11 +275,30 @@ component("media") {
defines = []
deps = [
":cdm_api",
+ "//base",
+ "//base:i18n",
+ "//base/third_party/dynamic_annotations",
+ "//crypto",
+ "//crypto:platform",
+ "//gpu/command_buffer/client:gles2_interface",
+ "//gpu/command_buffer/common",
+ "//skia",
+ "//third_party/libwebm",
+ "//third_party/libyuv",
+ "//ui/events:events_base",
+ "//ui/gfx",
+ "//ui/gfx/geometry",
+ "//ui/gl:gl",
+ "//url",
]
public_configs = [ "//third_party/libwebm:libwebm_config" ]
public_deps = [
":filters_common",
+ ":media_features",
+ ":shared_memory_support",
+ "//media/audio",
+ "//media/base",
]
include_dirs = [ "." ]
@@ -496,31 +516,6 @@ component("media") {
"device_monitors/device_monitor_udev.h",
]
}
-
- public_deps += [
- ":media_features",
- ":shared_memory_support",
- "//media/audio",
- "//media/base",
- ]
-
- deps += [
- "//base",
- "//base:i18n",
- "//base/third_party/dynamic_annotations",
- "//crypto",
- "//crypto:platform",
- "//gpu/command_buffer/client:gles2_interface",
- "//gpu/command_buffer/common",
- "//skia",
- "//third_party/libwebm",
- "//third_party/libyuv",
- "//ui/events:events_base",
- "//ui/gfx",
- "//ui/gfx/geometry",
- "//ui/gl:gl",
- "//url",
- ]
}
static_library("cdm_paths") {
« no previous file with comments | « content/browser/media/media_source_browsertest.cc ('k') | media/base/audio_video_metadata_extractor_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698