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

Unified Diff: media/BUILD.gn

Issue 839763002: fix builds with vpx and/or ffmpeg disabled (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: add fixups Created 5 years, 11 months 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 | media/filters/default_renderer_factory.cc » ('j') | media/filters/default_renderer_factory.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/BUILD.gn
diff --git a/media/BUILD.gn b/media/BUILD.gn
index 4445c3281299cfd2a9738f9e70e1365ceaeb6df9..af7aa572422b6fb882934ea9376d4b10d6e9a644 100644
--- a/media/BUILD.gn
+++ b/media/BUILD.gn
@@ -13,6 +13,12 @@ import("//media/media_options.gni")
# NOT for exporting.
config("media_config") {
defines = [ "MEDIA_IMPLEMENTATION" ]
+ if (!media_use_libvpx) {
+ defines += [ "MEDIA_DISABLE_LIBVPX" ]
+ }
+ if (!media_use_ffmpeg) {
+ defines += [ "MEDIA_DISABLE_FFMPEG" ]
+ }
if (cpu_arch == "arm" && arm_use_neon) {
defines += [ "USE_NEON" ]
}
@@ -32,6 +38,9 @@ config("media_dependent_config") {
if (!media_use_libvpx) {
defines += [ "MEDIA_DISABLE_LIBVPX" ]
}
+ if (!media_use_ffmpeg) {
+ defines += [ "MEDIA_DISABLE_FFMPEG" ]
+ }
if (is_win) {
ldflags = [
"/DELAYLOAD:mf.dll",
« no previous file with comments | « no previous file | media/filters/default_renderer_factory.cc » ('j') | media/filters/default_renderer_factory.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698