media/blink/media_blink.gyp - Issue 1567123002: Support CAST+WMPI 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 1567123002: Support CAST+WMPI on android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: build fixes + comments addressed 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:

Index: media/blink/media_blink.gyp

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

index 9bac71e3c93044e797dee2ba6fc9c908961ed61a..72eec89949d13d659d1817def9c5e612c928b8ca 100644

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

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

@@ -16,6 +16,7 @@

'../../cc/cc.gyp:cc',

'../../cc/blink/cc_blink.gyp:cc_blink',

'../../gpu/blink/gpu_blink.gyp:gpu_blink',

+ '../../gpu/gpu.gyp:gpu',

'../../ui/gfx/gfx.gyp:gfx_geometry',

'../../net/net.gyp:net',

'../../skia/skia.gyp:skia',

@@ -92,6 +93,12 @@

'websourcebuffer_impl.h',

'conditions': [

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

+ 'sources': [

+ 'webmediaplayer_cast_android.cc',

+ 'webmediaplayer_cast_android.h',

+ ],

+ }],

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

'sources!': [

'encrypted_media_player_support.cc',

« no previous file with comments | « media/blink/BUILD.gn ('k') | media/blink/renderer_media_player_interface.h » ('j') | no next file with comments »