summaryrefslogtreecommitdiffstats
path: root/media/libmediaplayerservice
diff options
context:
space:
mode:
authorNicholas Flintham <nick@flinny.org>2013-06-29 12:46:34 +0100
committerGerrit Code Review <gerrit@cyanogenmod.org>2013-07-03 13:17:43 -0700
commitf02808339bb06f3fd243973db18d53089338fd94 (patch)
treed0456899c5d2b6c9caff7d622a1bb4e03bd8bdde /media/libmediaplayerservice
parent78e8d9f6068a8644f5bd19a46786d0bda0e8eeab (diff)
downloadframeworks_av-f02808339bb06f3fd243973db18d53089338fd94.zip
frameworks_av-f02808339bb06f3fd243973db18d53089338fd94.tar.gz
frameworks_av-f02808339bb06f3fd243973db18d53089338fd94.tar.bz2
Fix includes for media-caf
Change-Id: I5d6dedbb9ba03fc313ab27f91bf83376fa20a7a9
Diffstat (limited to 'media/libmediaplayerservice')
-rw-r--r--media/libmediaplayerservice/Android.mk9
1 files changed, 7 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