content/content_tests.gypi - Issue 1539983004: Convert enable_mpeg2ts into a new-style buildflag

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/content_tests.gypi

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:

Index: content/content_tests.gypi

diff --git a/content/content_tests.gypi b/content/content_tests.gypi

index c529ea30198d2c313190977f21e810e9cd8724e8..b1a87da52fc91ff253446b5324f9d595b248ca75 100644

--- a/content/content_tests.gypi

+++ b/content/content_tests.gypi

@@ -1500,6 +1500,7 @@

'dependencies': [

'<(DEPTH)/content/app/strings/content_strings.gyp:content_strings',

+ '<(DEPTH)/media/media.gyp:media_features',

'<(DEPTH)/net/net.gyp:net_resources',

'<(DEPTH)/third_party/WebKit/public/blink_resources.gyp:blink_resources',

'<(DEPTH)/third_party/iaccessible2/iaccessible2.gyp:iaccessible2',