diff options
| author | Gloria Wang <gwang@google.com> | 2010-10-25 15:23:04 -0700 |
|---|---|---|
| committer | Gloria Wang <gwang@google.com> | 2010-10-25 16:11:18 -0700 |
| commit | a9741a9232c81eaf59179acef91f5be46c42264e (patch) | |
| tree | 9a66416b42a28ec2ad4fa2ec520c42d976046aec /media/libstagefright/Android.mk | |
| parent | d8cba5371423841e6a85816ad4a7fd88d3a60b12 (diff) | |
| parent | dcd25efb46c41c8d24a0a9cf61fb57f84149709e (diff) | |
| download | frameworks_av-a9741a9232c81eaf59179acef91f5be46c42264e.zip frameworks_av-a9741a9232c81eaf59179acef91f5be46c42264e.tar.gz frameworks_av-a9741a9232c81eaf59179acef91f5be46c42264e.tar.bz2 | |
resolved conflicts for merge of 9084631d to gingerbread-plus-aosp
Change-Id: Ie2b675d50bfca3f33aee80f1a67c9f03d1f97472
Diffstat (limited to 'media/libstagefright/Android.mk')
| -rw-r--r-- | media/libstagefright/Android.mk | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/media/libstagefright/Android.mk b/media/libstagefright/Android.mk index 615f3e8..d674547 100644 --- a/media/libstagefright/Android.mk +++ b/media/libstagefright/Android.mk @@ -11,6 +11,7 @@ LOCAL_SRC_FILES:= \ AwesomePlayer.cpp \ CameraSource.cpp \ DataSource.cpp \ + DRMExtractor.cpp \ ESDS.cpp \ FileSource.cpp \ HTTPStream.cpp \ @@ -59,7 +60,8 @@ LOCAL_SHARED_LIBRARIES := \ libsonivox \ libvorbisidec \ libsurfaceflinger_client \ - libcamera_client + libcamera_client \ + libdrmframework LOCAL_STATIC_LIBRARIES := \ libstagefright_aacdec \ |