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

Unified Diff: media/media.gyp

Issue 1539983004: Convert enable_mpeg2ts into a new-style buildflag (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove redundant ffmpeg_branding introduced by incorrect merge Created 5 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/media.gyp
diff --git a/media/media.gyp b/media/media.gyp
index 3cbb74f7b085924244ff6a1e8978337f6b5c5961..0742b5a91069306751bcfb27c1053a583e5ac93b 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -48,10 +48,31 @@
],
'targets': [
{
+ # GN version: //media:media_features
+ 'target_name': 'media_features',
+ 'includes': [ '../build/buildflag_header.gypi' ],
+ 'variables': {
+ 'buildflag_header_path': 'media/media_features.h',
+ 'variables': {
+ 'conditions': [
+ ['chromecast == 1', {
+ 'enable_mse_mpeg2ts_stream_parser%': 1,
+ }, {
+ 'enable_mse_mpeg2ts_stream_parser%': 0,
+ }],
+ ],
+ },
+ 'buildflag_flags': [
+ "ENABLE_MSE_MPEG2TS_STREAM_PARSER=<(enable_mse_mpeg2ts_stream_parser)",
+ ],
+ },
+ },
+ {
# GN version: //media
'target_name': 'media',
'type': '<(component)',
'dependencies': [
+ 'media_features',
'../base/base.gyp:base',
'../base/base.gyp:base_i18n',
'../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',

Powered by Google App Engine
This is Rietveld 408576698