commit bfb9fb143b67c2d0307af2bce9af3c08f362b29a
author Andreas Huber <andih@google.com> Thu Dec 03 11:31:19 2009 -0800
committer Andreas Huber <andih@google.com> Thu Dec 03 13:21:54 2009 -0800
tree 6b22297ab9749e2c86d3ae4844a7bad884027118
parent d345c6acedb22c9408553ef9f38c196984177e6b

Refactor MediaScanner. Some steps on the way towards being able to build the tree without OpenCore.

media/libmedia/Android.mk

diff --git a/media/libmedia/Android.mk b/media/libmedia/Android.mk
index 3c0ee1c..088ad6d 100644
--- a/media/libmedia/Android.mk
+++ b/media/libmedia/Android.mk
@@ -21,10 +21,18 @@
     ToneGenerator.cpp \
     JetPlayer.cpp \
     IOMX.cpp \
- 	IAudioPolicyService.cpp
+    IAudioPolicyService.cpp \
+    MediaScanner.cpp \
+    MediaScannerClient.cpp \
+    autodetect.cpp
+
+ifneq ($(BUILD_WITHOUT_PV),true)
+else
+LOCAL_SRC_FILES += StagefrightMediaScanner.cpp
+endif
 
 LOCAL_SHARED_LIBRARIES := \
-	libui libcutils libutils libbinder libsonivox
+	libui libcutils libutils libbinder libsonivox libicuuc
 
 LOCAL_MODULE:= libmedia
 
@@ -41,7 +49,8 @@
     $(call include-path-for, graphics corecg) \
         $(TOP)/external/opencore/extern_libs_v2/khronos/openmax/include \
         external/speex/include \
-        external/speex/libspeex
+        external/speex/libspeex \
+        external/icu4c/common
 
 LOCAL_STATIC_LIBRARIES := libspeex