exynos_omx: Unified source for exynos4/exynos5 series

Change-Id: I9587633d32ca3e61e9edb4d79c3b4b156944db85
Signed-off-by: Huisung Kang <hs1218.kang@samsung.com>

diff --git a/Android.mk b/Android.mk
index b06faa8e92a6329de8748e868dcf956282da922f..8e9de05dd35f49045ab9190e1c093ebcdfa3f845 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -30,7 +30,9 @@ include $(EXYNOS_OMX_COMPONENT)/common/Android.mk
 include $(EXYNOS_OMX_COMPONENT)/video/dec/Android.mk
 include $(EXYNOS_OMX_COMPONENT)/video/dec/h264/Android.mk
 include $(EXYNOS_OMX_COMPONENT)/video/dec/mpeg4/Android.mk
+ifeq ($(TARGET_BOARD_PLATFORM),exynos5)
 include $(EXYNOS_OMX_COMPONENT)/video/dec/vp8/Android.mk
+endif
 include $(EXYNOS_OMX_COMPONENT)/video/dec/mpeg2/Android.mk
 include $(EXYNOS_OMX_COMPONENT)/video/dec/vc1/Android.mk
 

diff --git a/component/video/dec/h264/Android.mk b/component/video/dec/h264/Android.mk
index 3890fc29908e0de534a35f97fda1d102ccbe2b3e..f07f477ef57e6d912a18dbd2d5423cb1fc40143f 100644 (file)
--- a/component/video/dec/h264/Android.mk
+++ b/component/video/dec/h264/Android.mk
@@ -30,7 +30,10 @@ LOCAL_ARM_MODE := arm
 LOCAL_STATIC_LIBRARIES := libExynosOMX_Vdec libExynosOMX_OSAL libExynosOMX_Basecomponent \
        libswconverter libExynosVideoApi
 LOCAL_SHARED_LIBRARIES := libc libdl libcutils libutils libui \
-       libExynosOMX_Resourcemanager libcsc libexynosv4l2 libion_exynos libexynosgscaler
+       libExynosOMX_Resourcemanager libcsc libexynosv4l2 libion_exynos
+ifeq ($(TARGET_BOARD_PLATFORM),exynos5)
+LOCAL_SHARED_LIBRARIES += libexynosgscaler
+endif
 
 LOCAL_C_INCLUDES := \
        $(EXYNOS_OMX_INC)/exynos \

diff --git a/component/video/dec/mpeg2/Android.mk b/component/video/dec/mpeg2/Android.mk
index affd91acfac0521f9d7bce6ea61fbc6dd25a97dc..2b8002a0fb8e0845620a0577d7ca8960ade26012 100644 (file)
--- a/component/video/dec/mpeg2/Android.mk
+++ b/component/video/dec/mpeg2/Android.mk
@@ -26,7 +26,10 @@ LOCAL_ARM_MODE := arm
 LOCAL_STATIC_LIBRARIES := libExynosOMX_Vdec libExynosOMX_OSAL libExynosOMX_Basecomponent \
        libswconverter libExynosVideoApi
 LOCAL_SHARED_LIBRARIES := libc libdl libcutils libutils libui \
-       libExynosOMX_Resourcemanager libcsc libexynosv4l2 libion_exynos libexynosgscaler
+       libExynosOMX_Resourcemanager libcsc libexynosv4l2 libion_exynos
+ifeq ($(TARGET_BOARD_PLATFORM),exynos5)
+LOCAL_SHARED_LIBRARIES += libexynosgscaler
+endif
 
 LOCAL_C_INCLUDES := \
        $(EXYNOS_OMX_INC)/exynos \

diff --git a/component/video/dec/mpeg4/Android.mk b/component/video/dec/mpeg4/Android.mk
index 487521271b2fe013d95aa5522183fc2356ea9539..bd231f2f219232ff85d43e514fda1c168c7243ba 100644 (file)
--- a/component/video/dec/mpeg4/Android.mk
+++ b/component/video/dec/mpeg4/Android.mk
@@ -26,7 +26,10 @@ LOCAL_ARM_MODE := arm
 LOCAL_STATIC_LIBRARIES := libExynosOMX_Vdec libExynosOMX_OSAL libExynosOMX_Basecomponent \
        libswconverter libExynosVideoApi
 LOCAL_SHARED_LIBRARIES := libc libdl libcutils libutils libui \
-       libExynosOMX_Resourcemanager libcsc libexynosv4l2 libion_exynos libexynosgscaler
+       libExynosOMX_Resourcemanager libcsc libexynosv4l2 libion_exynos
+ifeq ($(TARGET_BOARD_PLATFORM),exynos5)
+LOCAL_SHARED_LIBRARIES += libexynosgscaler
+endif
 
 LOCAL_C_INCLUDES := \
        $(EXYNOS_OMX_INC)/exynos \

diff --git a/component/video/dec/vc1/Android.mk b/component/video/dec/vc1/Android.mk
index 775fb9c1c7e2d1a7499b0b9dc89bb6b4309837b8..06715789aa503f5f2a30d3adff6e08a8794be6a3 100644 (file)
--- a/component/video/dec/vc1/Android.mk
+++ b/component/video/dec/vc1/Android.mk
@@ -26,7 +26,10 @@ LOCAL_ARM_MODE := arm
 LOCAL_STATIC_LIBRARIES := libExynosOMX_Vdec libExynosOMX_OSAL libExynosOMX_Basecomponent \
        libswconverter libExynosVideoApi
 LOCAL_SHARED_LIBRARIES := libc libdl libcutils libutils libui \
-       libExynosOMX_Resourcemanager libcsc libexynosv4l2 libion_exynos libexynosgscaler
+       libExynosOMX_Resourcemanager libcsc libexynosv4l2 libion_exynos
+ifeq ($(TARGET_BOARD_PLATFORM),exynos5)
+LOCAL_SHARED_LIBRARIES += libexynosgscaler
+endif
 
 LOCAL_C_INCLUDES := \
        $(EXYNOS_OMX_INC)/exynos \