summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordianlujitao <dianlujitao@gmail.com>2016-03-18 00:51:43 +0800
committerEthan Chen <intervigil@gmail.com>2016-03-17 10:26:13 -0700
commit3fa385a3bbb3e64c6e75e1c9372a3e69e3df57eb (patch)
tree8d870f30ef1baec4eb7c8fbe8b75a9c624f7b64c
parent1fd88aa0dd4968512cb0b307e1b8c212d0fd5b39 (diff)
downloadandroid_hardware_qcom_media-3fa385a3bbb3e64c6e75e1c9372a3e69e3df57eb.tar.gz
android_hardware_qcom_media-3fa385a3bbb3e64c6e75e1c9372a3e69e3df57eb.tar.bz2
android_hardware_qcom_media-3fa385a3bbb3e64c6e75e1c9372a3e69e3df57eb.zip
Fix subdirectory inclusion on CM
* CM doesn't use MSM_VIDC_TARGET_LIST Change-Id: I0a3b748f3261b944c276b053bf96a79092273c5a
-rw-r--r--Android.mk4
1 files changed, 1 insertions, 3 deletions
diff --git a/Android.mk b/Android.mk
index 1a11867d..9d88cd2b 100644
--- a/Android.mk
+++ b/Android.mk
@@ -7,9 +7,8 @@ include $(QCOM_MEDIA_ROOT)/mm-core/Android.mk
include $(QCOM_MEDIA_ROOT)/libstagefrighthw/Android.mk
endif
-ifneq ($(filter msm8909 msm8916 msm8939,$(TARGET_BOARD_PLATFORM)),)
ifneq ($(TARGET_SUPPORTS_WEARABLES),true)
-ifeq ($(call is-board-platform-in-list, $(MSM_VIDC_TARGET_LIST)),true)
+ifneq ($(filter msm8909 msm8916 msm8939,$(TARGET_BOARD_PLATFORM)),)
include $(QCOM_MEDIA_ROOT)/mm-video-v4l2/Android.mk
include $(QCOM_MEDIA_ROOT)/libc2dcolorconvert/Android.mk
@@ -20,4 +19,3 @@ endif
endif
endif
endif
-endif