summaryrefslogtreecommitdiffstats
path: root/media/media.gyp
diff options
context:
space:
mode:
authorqinmin@chromium.org <qinmin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-08 19:04:02 +0000
committerqinmin@chromium.org <qinmin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-08 19:04:02 +0000
commitbbb5eba591a4226e8a4ff8f617c6e86fd428664c (patch)
tree5237c106016ae63a148b8c0b4df46030119b7c8c /media/media.gyp
parent2da8060fe765a97c68de1f36398f5bf988662f8d (diff)
downloadchromium_src-bbb5eba591a4226e8a4ff8f617c6e86fd428664c.zip
chromium_src-bbb5eba591a4226e8a4ff8f617c6e86fd428664c.tar.gz
chromium_src-bbb5eba591a4226e8a4ff8f617c6e86fd428664c.tar.bz2
Add MediaPlayerAndroid as a super class for all media player implementations on android.
There are several different implementations of media players on Android. Currently they all inherit from MediaPlayerBridge. This only works if their java player is a subclass of Android MediaPlayer class, which is not necessary in some cases. Additionally, we are not going to use any subclass of android MediaPlayer for MSE implementation As a result, this change introduces a super class for all the media player implementations. BUG=233420 R=scherkus@chromium.org, ycheo@chromium.org, yfriedman@chromium.org Review URL: https://codereview.chromium.org/14762006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@198957 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/media.gyp')
-rw-r--r--media/media.gyp2
1 files changed, 2 insertions, 0 deletions
diff --git a/media/media.gyp b/media/media.gyp
index 557d118..d2dd550 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -1529,6 +1529,8 @@
'base/android/media_codec_bridge.h',
'base/android/media_jni_registrar.cc',
'base/android/media_jni_registrar.h',
+ 'base/android/media_player_android.cc',
+ 'base/android/media_player_android.h',
'base/android/media_player_bridge.cc',
'base/android/media_player_bridge.h',
'base/android/media_player_listener.cc',