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
diff --git a/media/libmediaplayerservice/MediaRecorderClient.cpp b/media/libmediaplayerservice/MediaRecorderClient.cpp
index 2ea7cc3..c507669 100644
--- a/media/libmediaplayerservice/MediaRecorderClient.cpp
+++ b/media/libmediaplayerservice/MediaRecorderClient.cpp
@@ -30,7 +30,11 @@
#include <binder/IServiceManager.h>
#include <binder/MemoryHeapBase.h>
#include <binder/MemoryBase.h>
+
+#ifndef NO_OPENCORE
#include <media/PVMediaRecorder.h>
+#endif
+
#include <utils/String16.h>
#include <media/AudioTrack.h>
@@ -297,9 +301,15 @@
mRecorder = new StagefrightRecorder;
} else
#endif
+#ifndef NO_OPENCORE
{
mRecorder = new PVMediaRecorder();
}
+#else
+ {
+ mRecorder = NULL;
+ }
+#endif
mMediaPlayerService = service;
}