summaryrefslogtreecommitdiffstats
path: root/exynos/multimedia/openmax/component
diff options
context:
space:
mode:
authorcodeworkx <daniel.hillenbrand@codeworkx.de>2012-06-16 17:00:32 +0400
committerGerrit Code Review <gerrit@review.cyanogenmod.com>2012-06-16 17:00:32 +0400
commit15b850d507ab3aa1fe284a97a700ac4640a4fdc0 (patch)
tree204d425e32f479ca209bcda484e3db1b1232bf50 /exynos/multimedia/openmax/component
parent64dd846ab4ff2eb8a56cb00bcc91c05565167673 (diff)
parent9375b16344e6744c0cf8f6bd5b8765f2d45d60a2 (diff)
downloadandroid_hardware_samsung-15b850d507ab3aa1fe284a97a700ac4640a4fdc0.tar.gz
android_hardware_samsung-15b850d507ab3aa1fe284a97a700ac4640a4fdc0.tar.bz2
android_hardware_samsung-15b850d507ab3aa1fe284a97a700ac4640a4fdc0.zip
Merge "omx: build shared instead of static libs for exynos4x12" into ics
Diffstat (limited to 'exynos/multimedia/openmax/component')
-rw-r--r--exynos/multimedia/openmax/component/video/dec/h264/Android.mk2
-rw-r--r--exynos/multimedia/openmax/component/video/dec/mpeg4/Android.mk2
-rw-r--r--exynos/multimedia/openmax/component/video/dec/vc1/Android.mk2
-rw-r--r--exynos/multimedia/openmax/component/video/dec/vp8/Android.mk2
-rw-r--r--exynos/multimedia/openmax/component/video/enc/h264/Android.mk2
-rw-r--r--exynos/multimedia/openmax/component/video/enc/mpeg4/Android.mk2
6 files changed, 6 insertions, 6 deletions
diff --git a/exynos/multimedia/openmax/component/video/dec/h264/Android.mk b/exynos/multimedia/openmax/component/video/dec/h264/Android.mk
index f491d60..55d65a7 100644
--- a/exynos/multimedia/openmax/component/video/dec/h264/Android.mk
+++ b/exynos/multimedia/openmax/component/video/dec/h264/Android.mk
@@ -40,7 +40,7 @@ LOCAL_SHARED_LIBRARIES := libc libdl libcutils libutils libui \
libSEC_OMX_Resourcemanager
ifeq ($(TARGET_SOC),exynos4x12)
-LOCAL_SHARED_LIBRARIES += libsecmfcdecapi
+LOCAL_SHARED_LIBRARIES += libsecmfcdecapi libsecmfcencapi
else
LOCAL_STATIC_LIBRARIES += libsecmfcapi
endif
diff --git a/exynos/multimedia/openmax/component/video/dec/mpeg4/Android.mk b/exynos/multimedia/openmax/component/video/dec/mpeg4/Android.mk
index 3ea203f..9c3d412 100644
--- a/exynos/multimedia/openmax/component/video/dec/mpeg4/Android.mk
+++ b/exynos/multimedia/openmax/component/video/dec/mpeg4/Android.mk
@@ -34,7 +34,7 @@ LOCAL_SHARED_LIBRARIES := libc libdl libcutils libutils libui \
libSEC_OMX_Resourcemanager
ifeq ($(TARGET_SOC),exynos4x12)
-LOCAL_SHARED_LIBRARIES += libsecmfcdecapi
+LOCAL_SHARED_LIBRARIES += libsecmfcdecapi libsecmfcencapi
else
LOCAL_STATIC_LIBRARIES += libsecmfcapi
endif
diff --git a/exynos/multimedia/openmax/component/video/dec/vc1/Android.mk b/exynos/multimedia/openmax/component/video/dec/vc1/Android.mk
index 7ca0477..0b30f8c 100644
--- a/exynos/multimedia/openmax/component/video/dec/vc1/Android.mk
+++ b/exynos/multimedia/openmax/component/video/dec/vc1/Android.mk
@@ -34,7 +34,7 @@ LOCAL_SHARED_LIBRARIES := libc libdl libcutils libutils libui \
libSEC_OMX_Resourcemanager
ifeq ($(TARGET_SOC),exynos4x12)
-LOCAL_SHARED_LIBRARIES += libsecmfcdecapi
+LOCAL_SHARED_LIBRARIES += libsecmfcdecapi libsecmfcencapi
else
LOCAL_STATIC_LIBRARIES += libsecmfcapi
endif
diff --git a/exynos/multimedia/openmax/component/video/dec/vp8/Android.mk b/exynos/multimedia/openmax/component/video/dec/vp8/Android.mk
index 734284f..9cb85a1 100644
--- a/exynos/multimedia/openmax/component/video/dec/vp8/Android.mk
+++ b/exynos/multimedia/openmax/component/video/dec/vp8/Android.mk
@@ -29,7 +29,7 @@ LOCAL_SHARED_LIBRARIES := libc libdl libcutils libutils libui \
libSEC_OMX_Resourcemanager
ifeq ($(TARGET_SOC),exynos4x12)
-LOCAL_SHARED_LIBRARIES += libsecmfcdecapi
+LOCAL_SHARED_LIBRARIES += libsecmfcdecapi libsecmfcencapi
else
LOCAL_STATIC_LIBRARIES += libsecmfcapi
endif
diff --git a/exynos/multimedia/openmax/component/video/enc/h264/Android.mk b/exynos/multimedia/openmax/component/video/enc/h264/Android.mk
index e9ebb60..fa57052 100644
--- a/exynos/multimedia/openmax/component/video/enc/h264/Android.mk
+++ b/exynos/multimedia/openmax/component/video/enc/h264/Android.mk
@@ -29,7 +29,7 @@ LOCAL_SHARED_LIBRARIES := libc libdl libcutils libutils libui \
libSEC_OMX_Resourcemanager
ifeq ($(TARGET_SOC),exynos4x12)
-LOCAL_SHARED_LIBRARIES += libsecmfcdecapi
+LOCAL_SHARED_LIBRARIES += libsecmfcdecapi libsecmfcencapi
else
LOCAL_STATIC_LIBRARIES += libsecmfcapi
endif
diff --git a/exynos/multimedia/openmax/component/video/enc/mpeg4/Android.mk b/exynos/multimedia/openmax/component/video/enc/mpeg4/Android.mk
index ed140d1..d14f61a 100644
--- a/exynos/multimedia/openmax/component/video/enc/mpeg4/Android.mk
+++ b/exynos/multimedia/openmax/component/video/enc/mpeg4/Android.mk
@@ -29,7 +29,7 @@ LOCAL_SHARED_LIBRARIES := libc libdl libcutils libutils libui \
libSEC_OMX_Resourcemanager
ifeq ($(TARGET_SOC),exynos4x12)
-LOCAL_SHARED_LIBRARIES += libsecmfcdecapi
+LOCAL_SHARED_LIBRARIES += libsecmfcdecapi libsecmfcencapi
else
LOCAL_STATIC_LIBRARIES += libsecmfcapi
endif