summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--media/libmediaplayerservice/Android.mk9
-rwxr-xr-xmedia/libstagefright/Android.mk5
2 files changed, 12 insertions, 2 deletions
diff --git a/media/libmediaplayerservice/Android.mk b/media/libmediaplayerservice/Android.mk
index d978e90..1683db2 100644
--- a/media/libmediaplayerservice/Android.mk
+++ b/media/libmediaplayerservice/Android.mk
@@ -53,8 +53,13 @@ LOCAL_C_INCLUDES := \
$(TOP)/external/tremolo/Tremolo
ifeq ($(BOARD_USES_QCOM_HARDWARE),true)
-LOCAL_C_INCLUDES += \
- $(TOP)/hardware/qcom/media/mm-core/inc
+ ifeq ($(TARGET_QCOM_MEDIA_VARIANT),caf)
+ LOCAL_C_INCLUDES += \
+ $(TOP)/hardware/qcom/media-caf/mm-core/inc
+ else
+ LOCAL_C_INCLUDES += \
+ $(TOP)/hardware/qcom/media/mm-core/inc
+ endif
endif
LOCAL_MODULE:= libmediaplayerservice
diff --git a/media/libstagefright/Android.mk b/media/libstagefright/Android.mk
index 766cf5e..a859e4a 100755
--- a/media/libstagefright/Android.mk
+++ b/media/libstagefright/Android.mk
@@ -95,8 +95,13 @@ LOCAL_SRC_FILES += \
ExtendedExtractor.cpp \
QCUtilityClass.cpp
+ifeq ($(TARGET_QCOM_MEDIA_VARIANT),caf)
+LOCAL_C_INCLUDES += \
+ $(TOP)/hardware/qcom/media-caf/mm-core/inc
+else
LOCAL_C_INCLUDES += \
$(TOP)/hardware/qcom/media/mm-core/inc
+endif
ifeq ($(TARGET_QCOM_AUDIO_VARIANT),caf)
ifeq ($(call is-board-platform-in-list,msm8660 msm7x27a msm7x30),true)