exynos: add libion dependencies

Change-Id: I7d1d86d996e28dd8094962860d57a8402215cc8e

diff --git a/libhdmi_dummy/Android.mk b/libhdmi_dummy/Android.mk
index fb147e4e859b13c6ace95636e6ca15404db01a99..ef0dee06f6b5387f8494ab9b7ca0b721bfb42507 100644 (file)
--- a/libhdmi_dummy/Android.mk
+++ b/libhdmi_dummy/Android.mk
@@ -16,7 +16,7 @@ LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)
 
 LOCAL_PRELINK_MODULE := false
-LOCAL_SHARED_LIBRARIES := liblog libutils libcutils libexynosutils \
+LOCAL_SHARED_LIBRARIES := liblog libion libutils libcutils libexynosutils \
                          libsync libexynosv4l2 libhwcutils libexynosdisplay \
                          libmpp
 

diff --git a/libhwc/Android.mk b/libhwc/Android.mk
index 04ce46a0df3152025dff3d1b28d6a79bbc2db8f3..543db818e682b82a4d94ef12f1369a83b29b8b7f 100644 (file)
--- a/libhwc/Android.mk
+++ b/libhwc/Android.mk
@@ -27,7 +27,7 @@ include $(CLEAR_VARS)
 
 LOCAL_PRELINK_MODULE := false
 LOCAL_MODULE_RELATIVE_PATH := hw
-LOCAL_SHARED_LIBRARIES := liblog libcutils libEGL libGLESv1_CM libhardware \
+LOCAL_SHARED_LIBRARIES := liblog libion libcutils libEGL libGLESv1_CM libhardware \
        libhardware_legacy libutils libsync \
        libexynosv4l2 libexynosutils libhwcutils libexynosdisplay libhdmi \
        libmpp

diff --git a/libvideocodec/Android.mk b/libvideocodec/Android.mk
index 346313c44ceabdf8fd65d1afbba9942a9cb74bf0..32765d5c398dc18539c6662c5e81898f26c92eb1 100644 (file)
--- a/libvideocodec/Android.mk
+++ b/libvideocodec/Android.mk
@@ -8,14 +8,12 @@ LOCAL_SRC_FILES := \
        enc/ExynosVideoEncoder.c
 
 LOCAL_C_INCLUDES := \
-       $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include \
        $(LOCAL_PATH)/include \
        $(TOP)/hardware/samsung_slsi/exynos/include \
        $(TOP)/hardware/samsung_slsi/$(TARGET_BOARD_PLATFORM)/include \
        $(TOP)/system/core/libion/include
 
-LOCAL_ADDITIONAL_DEPENDENCIES += \
-       $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
+LOCAL_HEADER_LIBRARIES := generated_kernel_headers
 
 ifeq ($(BOARD_USE_KHRONOS_OMX_HEADER), true)
 LOCAL_C_INCLUDES += $(TOP)/hardware/samsung_slsi/openmax/include/khronos
@@ -73,6 +71,8 @@ ifeq ($(BOARD_USE_DEINTERLACING_SUPPORT), true)
 LOCAL_CFLAGS += -DUSE_DEINTERLACING_SUPPORT
 endif
 
+LOCAL_SHARED_LIBRARIES = libion
+
 LOCAL_MODULE := libExynosVideoApi
 LOCAL_MODULE_TAGS := optional
 LOCAL_PRELINK_MODULE := false

diff --git a/libvppdisplay/Android.mk b/libvppdisplay/Android.mk
index 29e8f1fecc895169344e442577ffa6cbcdcce7e0..4634e90c379dfa7b32360c04e9b42f6bfed2a2a2 100644 (file)
--- a/libvppdisplay/Android.mk
+++ b/libvppdisplay/Android.mk
@@ -16,7 +16,7 @@ LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)
 
 LOCAL_PRELINK_MODULE := false
-LOCAL_SHARED_LIBRARIES := liblog libutils libcutils libexynosutils \
+LOCAL_SHARED_LIBRARIES := liblog libion libutils libcutils libexynosutils \
        libexynosv4l2 libsync libhwcutils
 #ifeq ($(BOARD_USES_FIMC), true)
 #LOCAL_SHARED_LIBRARIES += libexynosfimc