diff options
| author | James Dong <jdong@google.com> | 2010-01-19 17:45:38 -0800 |
|---|---|---|
| committer | James Dong <jdong@google.com> | 2010-02-01 22:38:37 -0800 |
| commit | c371194e4e0651c328f1870a90bbfd4e217c747b (patch) | |
| tree | 1a5227979a1493f7d33b8647c0caa3a897bcd812 /media/libmedia/Android.mk | |
| parent | f5dbf6a62af04af9e88c5552aa7eeffb0a2394a4 (diff) | |
| download | frameworks_base-c371194e4e0651c328f1870a90bbfd4e217c747b.zip frameworks_base-c371194e4e0651c328f1870a90bbfd4e217c747b.tar.gz frameworks_base-c371194e4e0651c328f1870a90bbfd4e217c747b.tar.bz2 | |
Initial check-in for xml-based encoder capabilities retrieval
- Changed the Java API as suggested
- Treat /etc/media_profiles.xml as the default xml configurtion file
Diffstat (limited to 'media/libmedia/Android.mk')
| -rw-r--r-- | media/libmedia/Android.mk | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/media/libmedia/Android.mk b/media/libmedia/Android.mk index 4ae4ec9b..c59d323 100644 --- a/media/libmedia/Android.mk +++ b/media/libmedia/Android.mk @@ -25,10 +25,11 @@ LOCAL_SRC_FILES:= \ MediaScanner.cpp \ MediaScannerClient.cpp \ autodetect.cpp \ - IMediaDeathNotifier.cpp + IMediaDeathNotifier.cpp \ + MediaProfiles.cpp LOCAL_SHARED_LIBRARIES := \ - libui libcutils libutils libbinder libsonivox libicuuc + libui libcutils libutils libbinder libsonivox libicuuc libexpat LOCAL_MODULE:= libmedia @@ -43,10 +44,11 @@ endif LOCAL_C_INCLUDES := \ $(JNI_H_INCLUDE) \ $(call include-path-for, graphics corecg) \ - $(TOP)/external/opencore/extern_libs_v2/khronos/openmax/include \ - external/speex/include \ - external/speex/libspeex \ - external/icu4c/common + $(TOP)/external/opencore/extern_libs_v2/khronos/openmax/include \ + external/speex/include \ + external/speex/libspeex \ + external/icu4c/common \ + external/expat/lib LOCAL_STATIC_LIBRARIES := libspeex |