mm-video: Target specific checks for USE_ION
Change-Id: I3be070eb9873757a3c36ce9dc1515350d7981fb0
diff --git a/mm-video/vidc/vdec/Android.mk b/mm-video/vidc/vdec/Android.mk
index fb9fe31..bbd5feb 100755
--- a/mm-video/vidc/vdec/Android.mk
+++ b/mm-video/vidc/vdec/Android.mk
@@ -48,9 +48,11 @@
libOmxVdec-def += -D_ANDROID_ICS_
-#ifeq ($(TARGET_USES_ION),true)
+ifeq ($(TARGET_USES_ION),true)
libOmxVdec-def += -DUSE_ION
-#endif
+else
+vdec-inc = $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
+endif
# ---------------------------------------------------------------------------------
# Make the Shared library (libOmxVdec)
@@ -71,6 +73,7 @@
libmm-vdec-inc += hardware/qcom/display/libgenlock
libmm-vdec-inc += frameworks/native/include/media/openmax
libmm-vdec-inc += frameworks/native/include/media/hardware
+libmm-vdec-inc += $(vdec-inc)
LOCAL_MODULE := libOmxVdec
LOCAL_MODULE_TAGS := optional
@@ -89,6 +92,8 @@
LOCAL_SRC_FILES += src/mp4_utils.cpp
LOCAL_SRC_FILES += src/omx_vdec.cpp
LOCAL_SRC_FILES += ../common/src/extra_data_handler.cpp
+LOCAL_ADDITIONAL_DEPENDENCIES := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
+
include $(BUILD_SHARED_LIBRARY)
# ---------------------------------------------------------------------------------
@@ -98,7 +103,7 @@
mm-vdec-test-inc := hardware/qcom/media/mm-core/inc
mm-vdec-test-inc += $(LOCAL_PATH)/inc
-#mm-vdec-test-inc += bionic/libc/kernel/common/linux
+mm-vdec-test-inc += $(vdec-inc)
LOCAL_MODULE := mm-vdec-omx-test
LOCAL_MODULE_TAGS := optional
@@ -110,6 +115,7 @@
LOCAL_SRC_FILES := src/queue.c
LOCAL_SRC_FILES += test/omx_vdec_test.cpp
+LOCAL_ADDITIONAL_DEPENDENCIES := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
include $(BUILD_EXECUTABLE)
@@ -120,7 +126,7 @@
mm-vdec-drv-test-inc := hardware/qcom/media/mm-core/inc
mm-vdec-drv-test-inc += $(LOCAL_PATH)/inc
-#mm-vdec-drv-test-inc += bionic/libc/kernel/common/linux
+mm-vdec-drv-test-inc += $(vdec-inc)
LOCAL_MODULE := mm-video-driver-test
LOCAL_MODULE_TAGS := optional
@@ -130,6 +136,7 @@
LOCAL_SRC_FILES := src/message_queue.c
LOCAL_SRC_FILES += test/decoder_driver_test.c
+LOCAL_ADDITIONAL_DEPENDENCIES := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
include $(BUILD_EXECUTABLE)