Refactor MediaScanner. Some steps on the way towards being able to build the tree without OpenCore.
diff --git a/media/libmediaplayerservice/Android.mk b/media/libmediaplayerservice/Android.mk
index 4784b8e..b8defde 100644
--- a/media/libmediaplayerservice/Android.mk
+++ b/media/libmediaplayerservice/Android.mk
@@ -37,13 +37,19 @@
 	libbinder             \
 	libvorbisidec         \
 	libsonivox            \
-	libopencore_player    \
-	libopencore_author    \
 	libmedia              \
 	libandroid_runtime    \
 	libstagefright        \
 	libstagefright_omx
 
+ifneq ($(BUILD_WITHOUT_PV),true)
+LOCAL_SHARED_LIBRARIES += \
+	libopencore_player    \
+	libopencore_author
+else
+LOCAL_CFLAGS += -DNO_OPENCORE
+endif
+
 ifneq ($(TARGET_SIMULATOR),true)
 LOCAL_SHARED_LIBRARIES += libdl
 endif