media/media.gyp - Issue 1048863002: Remove android_webview_build conditions from various places.

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/media.gyp

Issue 1048863002: Remove android_webview_build conditions from various places. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 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/media.gyp

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

index 3a3219400951bd56bb81876fc5dc37bb0f70280f..86e4ec823938d6928ae0a5ff691b7b8e0fd2ec6e 100644

--- a/media/media.gyp

+++ b/media/media.gyp

@@ -711,6 +711,7 @@

['OS=="android"', {

'dependencies': [

'media_android_jni_headers',

+ 'media_java',

'player_android',

'video_capture_android_jni_headers',

@@ -725,13 +726,6 @@

'renderers/default_renderer_factory.cc',

'renderers/default_renderer_factory.h',

- 'conditions': [

- ['android_webview_build==0', {

- 'dependencies': [

- 'media_java',

- ],

- }],

- ],

'defines': [

'DISABLE_USER_INPUT_MONITOR',

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