diff options
| author | John Grossman <johngro@google.com> | 2012-08-13 09:56:22 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-08-13 09:56:22 -0700 |
| commit | 4fc9d476db8ba59053deac76dce9f403c34a0f2d (patch) | |
| tree | 890aa2ee51b6b650d744557ddd92df9722e0cb5f /media/libmediaplayerservice/Android.mk | |
| parent | 518cdbe52b60af91a2bd2d3ce2d29feac884ae02 (diff) | |
| parent | 73247cac58b0c295e02b2350722699689ac45189 (diff) | |
| download | frameworks_av-4fc9d476db8ba59053deac76dce9f403c34a0f2d.zip frameworks_av-4fc9d476db8ba59053deac76dce9f403c34a0f2d.tar.gz frameworks_av-4fc9d476db8ba59053deac76dce9f403c34a0f2d.tar.bz2 | |
am 73247cac: am d58a68a4: Merge changes Ibe7e6d4b,Icf8904db into jb-mr1-dev
* commit '73247cac58b0c295e02b2350722699689ac45189':
Move the AAH RTP code out of framework and into vendor.
Add the ability to dynamicaly register MediaPlayer types.
Diffstat (limited to 'media/libmediaplayerservice/Android.mk')
| -rw-r--r-- | media/libmediaplayerservice/Android.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/media/libmediaplayerservice/Android.mk b/media/libmediaplayerservice/Android.mk index f173e2e..1373d3c 100644 --- a/media/libmediaplayerservice/Android.mk +++ b/media/libmediaplayerservice/Android.mk @@ -10,6 +10,7 @@ LOCAL_SRC_FILES:= \ ActivityManager.cpp \ Crypto.cpp \ MediaRecorderClient.cpp \ + MediaPlayerFactory.cpp \ MediaPlayerService.cpp \ MetadataRetrieverClient.cpp \ TestPlayerStub.cpp \ @@ -31,8 +32,7 @@ LOCAL_SHARED_LIBRARIES := \ libstagefright_omx \ libstagefright_foundation \ libgui \ - libdl \ - libaah_rtp + libdl LOCAL_STATIC_LIBRARIES := \ libstagefright_nuplayer \ |