diff options
| author | Andreas Huber <andih@google.com> | 2012-02-29 15:47:17 -0800 |
|---|---|---|
| committer | Andreas Huber <andih@google.com> | 2012-03-01 11:30:10 -0800 |
| commit | afc16d667afa23f5aa00154ccad62f8c45cf5419 (patch) | |
| tree | e7a7573397177303112c1809f0087b25c8a30397 /media/libstagefright/Android.mk | |
| parent | df94a547d8036619d15975873a1ff5736b0f14fe (diff) | |
| download | frameworks_av-afc16d667afa23f5aa00154ccad62f8c45cf5419.zip frameworks_av-afc16d667afa23f5aa00154ccad62f8c45cf5419.tar.gz frameworks_av-afc16d667afa23f5aa00154ccad62f8c45cf5419.tar.bz2 | |
Instead of hardcoding OMX component names in our code, support
a config file instead.
Change-Id: I5835903ab9f1c4a22ccc605ca99ed966767adf57
Diffstat (limited to 'media/libstagefright/Android.mk')
| -rw-r--r-- | media/libstagefright/Android.mk | 31 |
1 files changed, 17 insertions, 14 deletions
diff --git a/media/libstagefright/Android.mk b/media/libstagefright/Android.mk index 95bcada..21d6866 100644 --- a/media/libstagefright/Android.mk +++ b/media/libstagefright/Android.mk @@ -30,6 +30,7 @@ LOCAL_SRC_FILES:= \ MediaBuffer.cpp \ MediaBufferGroup.cpp \ MediaCodec.cpp \ + MediaCodecList.cpp \ MediaDefs.cpp \ MediaExtractor.cpp \ MediaSource.cpp \ @@ -59,31 +60,33 @@ LOCAL_C_INCLUDES:= \ $(JNI_H_INCLUDE) \ $(TOP)/frameworks/base/include/media/stagefright/openmax \ $(TOP)/frameworks/base/include/media/stagefright/timedtext \ + $(TOP)/external/expat/lib \ $(TOP)/external/flac/include \ $(TOP)/external/tremolo \ $(TOP)/external/openssl/include \ LOCAL_SHARED_LIBRARIES := \ libbinder \ - libmedia \ - libutils \ - libcutils \ - libui \ - libsonivox \ - libvorbisidec \ - libstagefright_yuv \ libcamera_client \ - libdrmframework \ + libchromium_net \ libcrypto \ - libssl \ + libcutils \ + libdl \ + libdrmframework \ + libexpat \ libgui \ - libstagefright_omx \ - liblog \ - libicuuc \ libicui18n \ + libicuuc \ + liblog \ + libmedia \ + libsonivox \ + libssl \ + libstagefright_omx \ + libstagefright_yuv \ + libui \ + libutils \ + libvorbisidec \ libz \ - libdl \ - libchromium_net \ LOCAL_STATIC_LIBRARIES := \ libstagefright_color_conversion \ |