From 0b0ee3f786eea682d4ae8e79689d0c6aa2aaeb78 Mon Sep 17 00:00:00 2001 From: Jan Altensen Date: Wed, 8 Apr 2020 23:01:30 +0200 Subject: [PATCH] exynos: add libion dependencies Change-Id: I7d1d86d996e28dd8094962860d57a8402215cc8e --- libhdmi_dummy/Android.mk | 2 +- libhwc/Android.mk | 2 +- libvideocodec/Android.mk | 6 +++--- libvppdisplay/Android.mk | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libhdmi_dummy/Android.mk b/libhdmi_dummy/Android.mk index fb147e4..ef0dee0 100644 --- 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 04ce46a..543db81 100644 --- 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 346313c..32765d5 100644 --- 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 29e8f1f..4634e90 100644 --- 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 -- 2.20.1