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

Unified Diff: media/BUILD.gn

Issue 1569053002: Raise gyp/GN failure if proprietary_codecs=1 and ffmpeg_branding=Chromium (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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
Index: media/BUILD.gn
diff --git a/media/BUILD.gn b/media/BUILD.gn
index 7d03d4d87ea2827b7713e06f0ded7a787f28b383..f9b0b7416e8d7c5731298655f0abf76d56f5fe27 100644
--- a/media/BUILD.gn
+++ b/media/BUILD.gn
@@ -18,6 +18,12 @@ buildflag_header("media_features") {
[ "ENABLE_MSE_MPEG2TS_STREAM_PARSER=$enable_mse_mpeg2ts_stream_parser" ]
}
+# XXX how to get same behaviour as 'ffmpeg_branding%': "Chromium",
+if (proprietary_codecs && media_use_ffmpeg && ffmpeg_branding == "Chromium") {
+ #XXX how to fail ?
+ #proprietary codecs and ffmpeg_branding set to Chromium are incompatible
+}
jrummell 2016/01/11 22:05:47 Looks like assert() is the way to fail. Maybe remo
Julien Isorce Samsung 2016/08/17 23:54:58 Done, thx.
+
# Common configuration for targets in the media directory.
# NOT for exporting.
config("media_config") {

Powered by Google App Engine
This is Rietveld 408576698