Deal better with situations where OpenCORE is disabled.
diff --git a/media/libmediaplayerservice/Android.mk b/media/libmediaplayerservice/Android.mk
index 922df43..c45eb3d 100644
--- a/media/libmediaplayerservice/Android.mk
+++ b/media/libmediaplayerservice/Android.mk
@@ -7,12 +7,16 @@
include $(CLEAR_VARS)
LOCAL_SRC_FILES:= \
- MediaRecorderClient.cpp \
MediaPlayerService.cpp \
MetadataRetrieverClient.cpp \
VorbisPlayer.cpp \
MidiFile.cpp
+ifneq ($(BUILD_WITHOUT_PV),true)
+LOCAL_SRC_FILES+= \
+ MediaRecorderClient.cpp
+endif
+
ifeq ($(TARGET_OS)-$(TARGET_SIMULATOR),linux-true)
LOCAL_LDLIBS += -ldl -lpthread
endif
@@ -22,14 +26,22 @@
libutils \
libvorbisidec \
libsonivox \
- libopencore_player \
- libopencore_author \
libmedia \
libandroid_runtime
+ifneq ($(BUILD_WITHOUT_PV),true)
+LOCAL_SHARED_LIBRARIES += \
+ libopencore_player \
+ libopencore_author
+endif
+
LOCAL_C_INCLUDES := external/tremor/Tremor \
$(call include-path-for, graphics corecg)
+ifeq ($(BUILD_WITHOUT_PV),true)
+LOCAL_CFLAGS := -DNO_OPENCORE
+endif
+
LOCAL_MODULE:= libmediaplayerservice
include $(BUILD_SHARED_LIBRARY)