merge in jb-mr2-release history after reset to jb-mr2-dev
diff --git a/exynos_omx/openmax/exynos_omx/component/video/dec/h264/Android.mk b/exynos_omx/openmax/exynos_omx/component/video/dec/h264/Android.mk
index 5f8957d..94ced6a 100644
--- a/exynos_omx/openmax/exynos_omx/component/video/dec/h264/Android.mk
+++ b/exynos_omx/openmax/exynos_omx/component/video/dec/h264/Android.mk
@@ -29,7 +29,7 @@
LOCAL_STATIC_LIBRARIES := libExynosOMX_Vdec libExynosOMX_OSAL libExynosOMX_Basecomponent \
libswconverter libExynosVideoApi
-LOCAL_SHARED_LIBRARIES := libc libdl libcutils libutils libui \
+LOCAL_SHARED_LIBRARIES := libc libdl libcutils libutils liblog libui \
libExynosOMX_Resourcemanager libcsc libexynosv4l2 libion_exynos libexynosgscaler
ifeq ($(BOARD_USES_MFC_FPS),true)
diff --git a/exynos_omx/openmax/exynos_omx/component/video/dec/mpeg4/Android.mk b/exynos_omx/openmax/exynos_omx/component/video/dec/mpeg4/Android.mk
index 26876ee..5f2f98e 100644
--- a/exynos_omx/openmax/exynos_omx/component/video/dec/mpeg4/Android.mk
+++ b/exynos_omx/openmax/exynos_omx/component/video/dec/mpeg4/Android.mk
@@ -25,7 +25,7 @@
LOCAL_STATIC_LIBRARIES := libExynosOMX_Vdec libExynosOMX_OSAL libExynosOMX_Basecomponent \
libswconverter libExynosVideoApi
-LOCAL_SHARED_LIBRARIES := libc libdl libcutils libutils libui \
+LOCAL_SHARED_LIBRARIES := libc libdl libcutils libutils liblog libui \
libExynosOMX_Resourcemanager libcsc libexynosv4l2 libion_exynos libexynosgscaler
ifeq ($(BOARD_USES_MFC_FPS),true)
diff --git a/exynos_omx/openmax/exynos_omx/component/video/dec/vp8/Android.mk b/exynos_omx/openmax/exynos_omx/component/video/dec/vp8/Android.mk
index bd76dfc..54caa40 100644
--- a/exynos_omx/openmax/exynos_omx/component/video/dec/vp8/Android.mk
+++ b/exynos_omx/openmax/exynos_omx/component/video/dec/vp8/Android.mk
@@ -25,7 +25,7 @@
LOCAL_STATIC_LIBRARIES := libExynosOMX_Vdec libExynosOMX_OSAL libExynosOMX_Basecomponent \
libswconverter libExynosVideoApi
-LOCAL_SHARED_LIBRARIES := libc libdl libcutils libutils libui \
+LOCAL_SHARED_LIBRARIES := libc libdl libcutils libutils liblog libui \
libExynosOMX_Resourcemanager libcsc libexynosv4l2 libion_exynos libexynosgscaler
ifeq ($(BOARD_USES_MFC_FPS),true)
diff --git a/exynos_omx/openmax/exynos_omx/component/video/enc/h264/Android.mk b/exynos_omx/openmax/exynos_omx/component/video/enc/h264/Android.mk
index 9a9174e..074d506 100644
--- a/exynos_omx/openmax/exynos_omx/component/video/enc/h264/Android.mk
+++ b/exynos_omx/openmax/exynos_omx/component/video/enc/h264/Android.mk
@@ -22,7 +22,7 @@
LOCAL_STATIC_LIBRARIES := libExynosOMX_Venc libExynosOMX_OSAL libExynosOMX_Basecomponent \
libswconverter libExynosVideoApi
-LOCAL_SHARED_LIBRARIES := libc libdl libcutils libutils libui \
+LOCAL_SHARED_LIBRARIES := libc libdl libcutils libutils liblog libui \
libExynosOMX_Resourcemanager libcsc libexynosv4l2 libion_exynos
LOCAL_C_INCLUDES := $(EXYNOS_OMX_INC)/khronos \
diff --git a/exynos_omx/openmax/exynos_omx/component/video/enc/mpeg4/Android.mk b/exynos_omx/openmax/exynos_omx/component/video/enc/mpeg4/Android.mk
index dbd44f5..e1c5af6 100644
--- a/exynos_omx/openmax/exynos_omx/component/video/enc/mpeg4/Android.mk
+++ b/exynos_omx/openmax/exynos_omx/component/video/enc/mpeg4/Android.mk
@@ -21,7 +21,7 @@
LOCAL_STATIC_LIBRARIES := libExynosOMX_Venc libExynosOMX_OSAL libExynosOMX_Basecomponent \
libswconverter libExynosVideoApi
-LOCAL_SHARED_LIBRARIES := libc libdl libcutils libutils libui \
+LOCAL_SHARED_LIBRARIES := libc libdl libcutils libutils liblog libui \
libExynosOMX_Resourcemanager libcsc libexynosv4l2 libion_exynos
LOCAL_C_INCLUDES := $(EXYNOS_OMX_INC)/khronos \
diff --git a/exynos_omx/openmax/exynos_omx/core/Android.mk b/exynos_omx/openmax/exynos_omx/core/Android.mk
index 0e0bcb6..7de591d 100644
--- a/exynos_omx/openmax/exynos_omx/core/Android.mk
+++ b/exynos_omx/openmax/exynos_omx/core/Android.mk
@@ -15,7 +15,7 @@
LOCAL_ARM_MODE := arm
LOCAL_STATIC_LIBRARIES := libExynosOMX_OSAL libExynosOMX_Basecomponent
-LOCAL_SHARED_LIBRARIES := libc libdl libcutils libutils \
+LOCAL_SHARED_LIBRARIES := libc libdl libcutils libutils liblog \
libExynosOMX_Resourcemanager
LOCAL_C_INCLUDES := $(EXYNOS_OMX_INC)/khronos \
@@ -24,4 +24,3 @@
$(EXYNOS_OMX_TOP)/component/common
include $(BUILD_SHARED_LIBRARY)
-
diff --git a/libstagefrighthw/Android.mk b/libstagefrighthw/Android.mk
index a8af63c..91e3fb1 100644
--- a/libstagefrighthw/Android.mk
+++ b/libstagefrighthw/Android.mk
@@ -29,6 +29,7 @@
libbinder \
libutils \
libcutils \
+ liblog \
libui \
libdl \
libstagefright_foundation
