commit 1d7491b19516505e0754c66a3c8cd61811c9b6a6
author James Dong <jdong@google.com> Tue Jan 19 17:45:38 2010 -0800
committer James Dong <jdong@google.com> Mon Feb 01 22:38:37 2010 -0800
tree f5377efbec2f7f4980f35650506835e837573e22
parent 036a38099c9d339d77dc4a1a148db2907a618c2e

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

media/libmedia/Android.mk

diff --git a/media/libmedia/Android.mk b/media/libmedia/Android.mk
index 4ae4ec9..c59d323 100644
--- a/media/libmedia/Android.mk
+++ b/media/libmedia/Android.mk
@@ -25,10 +25,11 @@
     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 @@
 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