| Index: media/media.gyp
|
| diff --git a/media/media.gyp b/media/media.gyp
|
| index 9e9895be7874a30497e857e0cd3359ac8474ce97..44accbd701437ac446c17f989155d981a0d6f308 100644
|
| --- a/media/media.gyp
|
| +++ b/media/media.gyp
|
| @@ -1869,21 +1869,19 @@
|
| 'base/android/android_cdm_factory.h',
|
| 'base/android/audio_decoder_job.cc',
|
| 'base/android/audio_decoder_job.h',
|
| + 'base/android/audio_media_codec_decoder.cc',
|
| + 'base/android/audio_media_codec_decoder.h',
|
| 'base/android/demuxer_android.h',
|
| 'base/android/demuxer_stream_player_params.cc',
|
| 'base/android/demuxer_stream_player_params.h',
|
| 'base/android/media_client_android.cc',
|
| 'base/android/media_client_android.h',
|
| - 'base/android/media_codec_audio_decoder.cc',
|
| - 'base/android/media_codec_audio_decoder.h',
|
| 'base/android/media_codec_bridge.cc',
|
| 'base/android/media_codec_bridge.h',
|
| 'base/android/media_codec_decoder.cc',
|
| 'base/android/media_codec_decoder.h',
|
| 'base/android/media_codec_player.cc',
|
| 'base/android/media_codec_player.h',
|
| - 'base/android/media_codec_video_decoder.cc',
|
| - 'base/android/media_codec_video_decoder.h',
|
| 'base/android/media_codec_util.cc',
|
| 'base/android/media_codec_util.h',
|
| 'base/android/media_common_android.h',
|
| @@ -1916,6 +1914,8 @@
|
| 'base/android/sdk_media_codec_bridge.h',
|
| 'base/android/video_decoder_job.cc',
|
| 'base/android/video_decoder_job.h',
|
| + 'base/android/video_media_codec_decoder.cc',
|
| + 'base/android/video_media_codec_decoder.h',
|
| ],
|
| 'conditions': [
|
| # Only 64 bit builds are using android-21 NDK library, check common.gypi
|
|
|