summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcodeworkx <daniel.hillenbrand@codeworkx.de>2012-06-05 01:54:17 +0200
committercodeworkx <daniel.hillenbrand@codeworkx.de>2012-06-05 02:04:37 +0200
commit05804b14193b917e6acd9275fa29d0108a9945e6 (patch)
tree01a4da855615812ed59650b2b43b61c0bf00fe86
parentcf27f2a25b5492650b85be1b9459979aeba8e4a4 (diff)
downloadandroid_hardware_samsung-05804b14193b917e6acd9275fa29d0108a9945e6.tar.gz
android_hardware_samsung-05804b14193b917e6acd9275fa29d0108a9945e6.tar.bz2
android_hardware_samsung-05804b14193b917e6acd9275fa29d0108a9945e6.zip
codecs: build shared mfcapi lib on exynos4x12
Change-Id: I8a09f8e6e86191197f0382e5c40e6acd16f33cda
-rw-r--r--exynos/multimedia/codecs/video/exynos4/mfc/Android.mk8
-rw-r--r--exynos/multimedia/openmax/component/video/dec/h264/Android.mk8
-rw-r--r--exynos/multimedia/openmax/component/video/dec/mpeg4/Android.mk8
-rw-r--r--exynos/multimedia/openmax/component/video/dec/vc1/Android.mk8
-rw-r--r--exynos/multimedia/openmax/component/video/dec/vp8/Android.mk8
-rw-r--r--exynos/multimedia/openmax/component/video/enc/h264/Android.mk8
-rw-r--r--exynos/multimedia/openmax/component/video/enc/mpeg4/Android.mk8
7 files changed, 44 insertions, 12 deletions
diff --git a/exynos/multimedia/codecs/video/exynos4/mfc/Android.mk b/exynos/multimedia/codecs/video/exynos4/mfc/Android.mk
index 7341577..629e8d3 100644
--- a/exynos/multimedia/codecs/video/exynos4/mfc/Android.mk
+++ b/exynos/multimedia/codecs/video/exynos4/mfc/Android.mk
@@ -17,12 +17,6 @@ LOCAL_SRC_FILES := \
LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/include/
-LOCAL_MODULE := libsecmfcapi
-
-ifeq ($(TARGET_SOC),exynos4x12)
-LOCAL_MODULE_STEM := libsecmfcdecapi
-endif
-
LOCAL_PRELINK_MODULE := false
ifeq ($(BOARD_USES_MFC_FPS),true)
@@ -40,7 +34,9 @@ LOCAL_STATIC_LIBRARIES :=
LOCAL_SHARED_LIBRARIES := liblog
ifeq ($(TARGET_SOC),exynos4x12)
+LOCAL_MODULE := libsecmfcdecapi
include $(BUILD_SHARED_LIBRARY)
else
+LOCAL_MODULE := libsecmfcapi
include $(BUILD_STATIC_LIBRARY)
endif
diff --git a/exynos/multimedia/openmax/component/video/dec/h264/Android.mk b/exynos/multimedia/openmax/component/video/dec/h264/Android.mk
index 5ac0170..f491d60 100644
--- a/exynos/multimedia/openmax/component/video/dec/h264/Android.mk
+++ b/exynos/multimedia/openmax/component/video/dec/h264/Android.mk
@@ -35,10 +35,16 @@ endif
LOCAL_ARM_MODE := arm
LOCAL_STATIC_LIBRARIES := libSEC_OMX_Vdec libsecosal libsecbasecomponent \
- libseccscapi libsecmfcapi
+ libseccscapi
LOCAL_SHARED_LIBRARIES := libc libdl libcutils libutils libui \
libSEC_OMX_Resourcemanager
+ifeq ($(TARGET_SOC),exynos4x12)
+LOCAL_SHARED_LIBRARIES += libsecmfcdecapi
+else
+LOCAL_STATIC_LIBRARIES += libsecmfcapi
+endif
+
ifeq ($(filter-out exynos4,$(TARGET_BOARD_PLATFORM)),)
LOCAL_SHARED_LIBRARIES += libhwconverter
endif
diff --git a/exynos/multimedia/openmax/component/video/dec/mpeg4/Android.mk b/exynos/multimedia/openmax/component/video/dec/mpeg4/Android.mk
index d45c727..3ea203f 100644
--- a/exynos/multimedia/openmax/component/video/dec/mpeg4/Android.mk
+++ b/exynos/multimedia/openmax/component/video/dec/mpeg4/Android.mk
@@ -29,10 +29,16 @@ endif
LOCAL_ARM_MODE := arm
LOCAL_STATIC_LIBRARIES := libSEC_OMX_Vdec libsecosal libsecbasecomponent \
- libseccscapi libsecmfcapi
+ libseccscapi
LOCAL_SHARED_LIBRARIES := libc libdl libcutils libutils libui \
libSEC_OMX_Resourcemanager
+ifeq ($(TARGET_SOC),exynos4x12)
+LOCAL_SHARED_LIBRARIES += libsecmfcdecapi
+else
+LOCAL_STATIC_LIBRARIES += libsecmfcapi
+endif
+
ifeq ($(filter-out exynos4,$(TARGET_BOARD_PLATFORM)),)
LOCAL_SHARED_LIBRARIES += libhwconverter
endif
diff --git a/exynos/multimedia/openmax/component/video/dec/vc1/Android.mk b/exynos/multimedia/openmax/component/video/dec/vc1/Android.mk
index 9412233..7ca0477 100644
--- a/exynos/multimedia/openmax/component/video/dec/vc1/Android.mk
+++ b/exynos/multimedia/openmax/component/video/dec/vc1/Android.mk
@@ -29,10 +29,16 @@ endif
LOCAL_ARM_MODE := arm
LOCAL_STATIC_LIBRARIES := libSEC_OMX_Vdec libsecosal libsecbasecomponent \
- libseccscapi libsecmfcapi
+ libseccscapi
LOCAL_SHARED_LIBRARIES := libc libdl libcutils libutils libui \
libSEC_OMX_Resourcemanager
+ifeq ($(TARGET_SOC),exynos4x12)
+LOCAL_SHARED_LIBRARIES += libsecmfcdecapi
+else
+LOCAL_STATIC_LIBRARIES += libsecmfcapi
+endif
+
ifeq ($(filter-out exynos4,$(TARGET_BOARD_PLATFORM)),)
LOCAL_SHARED_LIBRARIES += libhwconverter
endif
diff --git a/exynos/multimedia/openmax/component/video/dec/vp8/Android.mk b/exynos/multimedia/openmax/component/video/dec/vp8/Android.mk
index e4629a6..734284f 100644
--- a/exynos/multimedia/openmax/component/video/dec/vp8/Android.mk
+++ b/exynos/multimedia/openmax/component/video/dec/vp8/Android.mk
@@ -24,10 +24,16 @@ endif
LOCAL_ARM_MODE := arm
LOCAL_STATIC_LIBRARIES := libSEC_OMX_Vdec libsecosal libsecbasecomponent \
- libseccscapi libsecmfcapi
+ libseccscapi
LOCAL_SHARED_LIBRARIES := libc libdl libcutils libutils libui \
libSEC_OMX_Resourcemanager
+ifeq ($(TARGET_SOC),exynos4x12)
+LOCAL_SHARED_LIBRARIES += libsecmfcdecapi
+else
+LOCAL_STATIC_LIBRARIES += libsecmfcapi
+endif
+
ifeq ($(filter-out exynos4,$(TARGET_BOARD_PLATFORM)),)
LOCAL_SHARED_LIBRARIES += libhwconverter
endif
diff --git a/exynos/multimedia/openmax/component/video/enc/h264/Android.mk b/exynos/multimedia/openmax/component/video/enc/h264/Android.mk
index 435fbf7..e9ebb60 100644
--- a/exynos/multimedia/openmax/component/video/enc/h264/Android.mk
+++ b/exynos/multimedia/openmax/component/video/enc/h264/Android.mk
@@ -24,10 +24,16 @@ endif
LOCAL_ARM_MODE := arm
LOCAL_STATIC_LIBRARIES := libSEC_OMX_Venc libsecosal libsecbasecomponent \
- libseccscapi libsecmfcapi
+ libseccscapi
LOCAL_SHARED_LIBRARIES := libc libdl libcutils libutils libui \
libSEC_OMX_Resourcemanager
+ifeq ($(TARGET_SOC),exynos4x12)
+LOCAL_SHARED_LIBRARIES += libsecmfcdecapi
+else
+LOCAL_STATIC_LIBRARIES += libsecmfcapi
+endif
+
LOCAL_C_INCLUDES := $(SEC_OMX_INC)/khronos \
$(SEC_OMX_INC)/sec \
$(SEC_OMX_TOP)/osal \
diff --git a/exynos/multimedia/openmax/component/video/enc/mpeg4/Android.mk b/exynos/multimedia/openmax/component/video/enc/mpeg4/Android.mk
index ad6a604..ed140d1 100644
--- a/exynos/multimedia/openmax/component/video/enc/mpeg4/Android.mk
+++ b/exynos/multimedia/openmax/component/video/enc/mpeg4/Android.mk
@@ -24,10 +24,16 @@ endif
LOCAL_ARM_MODE := arm
LOCAL_STATIC_LIBRARIES := libSEC_OMX_Venc libsecosal libsecbasecomponent \
- libseccscapi libsecmfcapi
+ libseccscapi
LOCAL_SHARED_LIBRARIES := libc libdl libcutils libutils libui \
libSEC_OMX_Resourcemanager
+ifeq ($(TARGET_SOC),exynos4x12)
+LOCAL_SHARED_LIBRARIES += libsecmfcdecapi
+else
+LOCAL_STATIC_LIBRARIES += libsecmfcapi
+endif
+
LOCAL_C_INCLUDES := $(SEC_OMX_INC)/khronos \
$(SEC_OMX_INC)/sec \
$(SEC_OMX_TOP)/osal \