media/media.gyp - Issue 666813002: GN: Fix Android component build

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 666813002: GN: Fix Android component build (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@gn-clank

Patch Set: Actually undo gyp change Created 6 years, 2 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 9b2b50fc4c1ff7c4b1fc9fadd23c3089cdc368ed..96c55765ed80e95bde67bbc2af711a97d43d2419 100644

--- a/media/media.gyp

+++ b/media/media.gyp

@@ -199,12 +199,6 @@

'audio/win/wavein_input_win.h',

'audio/win/waveout_output_win.cc',

'audio/win/waveout_output_win.h',

- 'base/android/demuxer_android.h',

- 'base/android/demuxer_stream_player_params.cc',

- 'base/android/demuxer_stream_player_params.h',

- 'base/android/media_player_manager.h',

- 'base/android/media_resource_getter.cc',

- 'base/android/media_resource_getter.h',

'base/audio_block_fifo.cc',

'base/audio_block_fifo.h',

'base/audio_buffer.cc',

@@ -1766,6 +1760,9 @@

'base/android/audio_decoder_job.cc',

'base/android/audio_decoder_job.h',

'base/android/browser_cdm_factory_android.cc',

+ 'base/android/demuxer_android.h',

+ 'base/android/demuxer_stream_player_params.cc',

+ 'base/android/demuxer_stream_player_params.h',

'base/android/media_codec_bridge.cc',

'base/android/media_codec_bridge.h',

'base/android/media_common_android.h',

@@ -1781,6 +1778,9 @@

'base/android/media_player_bridge.h',

'base/android/media_player_listener.cc',

'base/android/media_player_listener.h',

+ 'base/android/media_player_manager.h',

+ 'base/android/media_resource_getter.cc',

+ 'base/android/media_resource_getter.h',

'base/android/media_source_player.cc',

'base/android/media_source_player.h',

'base/android/media_url_interceptor.h',

« components/bookmarks.gypi ('K') | « media/blink/BUILD.gn ('k') | mojo/converters/surfaces/BUILD.gn » ('j') | mojo/services/native_viewport/BUILD.gn » ('J')