media/BUILD.gn - Issue 1577433004: Flip proprietary codecs to false for Android chromium builds.

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: media/BUILD.gn

Issue 1577433004: Flip proprietary codecs to false for Android chromium builds. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Undo comment change. Created 4 years, 9 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 34f6759ec9b942a9602defd08a802bbbc7ae9aa7..b075019687216a82657f041d3a4cfe0f07dd0af0 100644

--- a/media/BUILD.gn

+++ b/media/BUILD.gn

@@ -642,19 +642,15 @@ test("media_unittests") {

sources += [

"ffmpeg/ffmpeg_common_unittest.cc",

"filters/audio_decoder_unittest.cc",

+ "filters/audio_file_reader_unittest.cc",

"filters/blocking_url_protocol_unittest.cc",

+ "filters/ffmpeg_demuxer_unittest.cc",

"filters/ffmpeg_glue_unittest.cc",

"filters/in_memory_url_protocol_unittest.cc",

]

if (!is_android) {

sources += [

- # These tests are confused by Android always having proprietary

- # codecs enabled, but ffmpeg_branding=Chromium. These should be

- # fixed, http://crbug.com/570762.

- "filters/audio_file_reader_unittest.cc",

- "filters/ffmpeg_demuxer_unittest.cc",

# FFmpeg on Android does not include video decoders.

"filters/ffmpeg_video_decoder_unittest.cc",

]

« no previous file with comments | « content/browser/media/media_canplaytype_browsertest.cc ('k') | media/base/android/BUILD.gn » ('j') | no next file with comments »