media/blink/media_blink.gyp - Issue 1230793009: Initial support for the desktop media pipeline on Android.

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/blink/media_blink.gyp

Issue 1230793009: Initial support for the desktop media pipeline on Android. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: build_ffmpegsumo is gone! yay Created 5 years, 5 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/blink/media_blink.gyp

diff --git a/media/blink/media_blink.gyp b/media/blink/media_blink.gyp

index 3462a382c99d6165462a9d4b43ca982e7f7c8afc..254705ba47ddbec1987efc56fa4b3ee8db05e21b 100644

--- a/media/blink/media_blink.gyp

+++ b/media/blink/media_blink.gyp

@@ -3,6 +3,9 @@

# found in the LICENSE file.

{

+ 'includes': [

+ '../media_variables.gypi'

+ ],

'targets': [

{

# GN version: //media/blink

@@ -76,7 +79,7 @@

'websourcebuffer_impl.h',

'conditions': [

- ['OS=="android"', {

+ ['OS=="android" and media_use_ffmpeg==0', {

'sources!': [

'encrypted_media_player_support.cc',

'encrypted_media_player_support.h',

« no previous file with comments | « content/renderer/render_frame_impl.cc ('k') | media/ffmpeg/ffmpeg_common.cc » ('j') | no next file with comments »