From 02c2a34a7fc289c86874d26eaebda29848af2e52 Mon Sep 17 00:00:00 2001 From: codeworkx Date: Sun, 10 Jul 2011 06:29:22 -0700 Subject: [PATCH] more module name fixes --- liboverlay/Android.mk | 2 +- libstagefrighthw/SEC_OMX_Plugin.cpp | 2 +- .../sec_omx_component/video/dec/h264dec/Android.mk | 2 +- .../sec_omx_component/video/dec/mpeg4dec/Android.mk | 2 +- .../sec_omx_component/video/enc/h264enc/Android.mk | 2 +- .../sec_omx_component/video/enc/mpeg4enc/Android.mk | 2 +- sec_mm/sec_omx/sec_omx_core/secomxregistry | 8 ++++---- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/liboverlay/Android.mk b/liboverlay/Android.mk index 1114496..71b2f4f 100644 --- a/liboverlay/Android.mk +++ b/liboverlay/Android.mk @@ -30,6 +30,6 @@ LOCAL_C_INCLUDES := \ LOCAL_SRC_FILES := v4l2_utils.c overlay.cpp -LOCAL_MODULE := overlay.smdkc210 +LOCAL_MODULE := overlay.smdkv310 LOCAL_MODULE_TAGS := optional include $(BUILD_SHARED_LIBRARY) diff --git a/libstagefrighthw/SEC_OMX_Plugin.cpp b/libstagefrighthw/SEC_OMX_Plugin.cpp index e6022b3..0cd25d8 100644 --- a/libstagefrighthw/SEC_OMX_Plugin.cpp +++ b/libstagefrighthw/SEC_OMX_Plugin.cpp @@ -28,7 +28,7 @@ OMXPluginBase *createOMXPlugin() { } SECOMXPlugin::SECOMXPlugin() - : mLibHandle(dlopen("libSEC_OMX_Core.smdkc210.so", RTLD_NOW)), + : mLibHandle(dlopen("libSEC_OMX_Core.smdkv310.so", RTLD_NOW)), mInit(NULL), mDeinit(NULL), mComponentNameEnum(NULL), diff --git a/sec_mm/sec_omx/sec_omx_component/video/dec/h264dec/Android.mk b/sec_mm/sec_omx/sec_omx_component/video/dec/h264dec/Android.mk index ef63008..30b2876 100644 --- a/sec_mm/sec_omx/sec_omx_component/video/dec/h264dec/Android.mk +++ b/sec_mm/sec_omx/sec_omx_component/video/dec/h264dec/Android.mk @@ -14,7 +14,7 @@ LOCAL_CFLAGS := LOCAL_ARM_MODE := arm -LOCAL_STATIC_LIBRARIES := libSEC_OMX_Vdec.smdkv310 libsecosal.smdkv310 libsecbasecomponent.smdkv310 libsecmfcdecapi.smdkc210 +LOCAL_STATIC_LIBRARIES := libSEC_OMX_Vdec.smdkv310 libsecosal.smdkv310 libsecbasecomponent.smdkv310 libsecmfcdecapi.smdkv310 LOCAL_SHARED_LIBRARIES := libc libdl libcutils libutils LOCAL_C_INCLUDES := $(SEC_OMX_INC)/khronos \ diff --git a/sec_mm/sec_omx/sec_omx_component/video/dec/mpeg4dec/Android.mk b/sec_mm/sec_omx/sec_omx_component/video/dec/mpeg4dec/Android.mk index 673ce21..2d64038 100644 --- a/sec_mm/sec_omx/sec_omx_component/video/dec/mpeg4dec/Android.mk +++ b/sec_mm/sec_omx/sec_omx_component/video/dec/mpeg4dec/Android.mk @@ -14,7 +14,7 @@ LOCAL_CFLAGS := LOCAL_ARM_MODE := arm -LOCAL_STATIC_LIBRARIES := libSEC_OMX_Vdec.smdkv310 libsecosal.smdkv310 libsecbasecomponent.smdkv310 libsecmfcdecapi.smdkc210 +LOCAL_STATIC_LIBRARIES := libSEC_OMX_Vdec.smdkv310 libsecosal.smdkv310 libsecbasecomponent.smdkv310 libsecmfcdecapi.smdkv310 LOCAL_SHARED_LIBRARIES := libc libdl libcutils libutils LOCAL_C_INCLUDES := $(SEC_OMX_INC)/khronos \ diff --git a/sec_mm/sec_omx/sec_omx_component/video/enc/h264enc/Android.mk b/sec_mm/sec_omx/sec_omx_component/video/enc/h264enc/Android.mk index 9e4bfea..b2310a9 100644 --- a/sec_mm/sec_omx/sec_omx_component/video/enc/h264enc/Android.mk +++ b/sec_mm/sec_omx/sec_omx_component/video/enc/h264enc/Android.mk @@ -14,7 +14,7 @@ LOCAL_CFLAGS := LOCAL_ARM_MODE := arm -LOCAL_STATIC_LIBRARIES := libSEC_OMX_Venc.smdkv310 libsecosal.smdkv310 libsecbasecomponent.smdkv310 libsecmfcencapi.smdkc210 +LOCAL_STATIC_LIBRARIES := libSEC_OMX_Venc.smdkv310 libsecosal.smdkv310 libsecbasecomponent.smdkv310 libsecmfcencapi.smdkv310 LOCAL_SHARED_LIBRARIES := libc libdl libcutils libutils LOCAL_C_INCLUDES := $(SEC_OMX_INC)/khronos \ diff --git a/sec_mm/sec_omx/sec_omx_component/video/enc/mpeg4enc/Android.mk b/sec_mm/sec_omx/sec_omx_component/video/enc/mpeg4enc/Android.mk index 329ce19..73c7f4a 100644 --- a/sec_mm/sec_omx/sec_omx_component/video/enc/mpeg4enc/Android.mk +++ b/sec_mm/sec_omx/sec_omx_component/video/enc/mpeg4enc/Android.mk @@ -14,7 +14,7 @@ LOCAL_CFLAGS := LOCAL_ARM_MODE := arm -LOCAL_STATIC_LIBRARIES := libSEC_OMX_Venc.smdkv310 libsecosal.smdkv310 libsecbasecomponent.smdkv310 libsecmfcencapi.smdkc210 +LOCAL_STATIC_LIBRARIES := libSEC_OMX_Venc.smdkv310 libsecosal.smdkv310 libsecbasecomponent.smdkv310 libsecmfcencapi.smdkv310 LOCAL_SHARED_LIBRARIES := libc libdl libcutils libutils LOCAL_C_INCLUDES := $(SEC_OMX_INC)/khronos \ diff --git a/sec_mm/sec_omx/sec_omx_core/secomxregistry b/sec_mm/sec_omx/sec_omx_core/secomxregistry index eb79124..2460af6 100644 --- a/sec_mm/sec_omx/sec_omx_core/secomxregistry +++ b/sec_mm/sec_omx/sec_omx_core/secomxregistry @@ -1,4 +1,4 @@ -libOMX.SEC.AVC.Decoder.smdkc210.so -libOMX.SEC.M4V.Decoder.smdkc210.so -libOMX.SEC.AVC.Encoder.smdkc210.so -libOMX.SEC.M4V.Encoder.smdkc210.so +libOMX.SEC.AVC.Decoder.smdkv310.so +libOMX.SEC.M4V.Decoder.smdkv310.so +libOMX.SEC.AVC.Encoder.smdkv310.so +libOMX.SEC.M4V.Encoder.smdkv310.so