commit 54cac898e5c75d41496411c17c714ee7629ec6bd
author Liang Liu <lianliu@codeaurora.org> Thu Jun 18 14:44:10 2020 +0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Wed Aug 05 15:05:13 2020 -0700
tree b38b23a82e44b052ae3203eebacf00d64e35cd3c
parent 00b71c2184427165f1f23a38a6fd5f6c2458f7ed

display-hal: fix compile errors with 5.4 kernel

Add uapi/include/display to include search path and add sde_drm.h
to fix compile errors with 5.4 kernel. This change is backward
compatible and is also working in 4.14 kernel.

Change-Id: I47b025301fa53fbd4bc1cceb013db3648b5a61cd
Signed-off-by: Liang Liu <lianliu@codeaurora.org>

libdrmutils/Android.mk

diff --git a/libdrmutils/Android.mk b/libdrmutils/Android.mk
index 172233f..e448d4f 100644
--- a/libdrmutils/Android.mk
+++ b/libdrmutils/Android.mk
@@ -5,7 +5,8 @@
 LOCAL_VENDOR_MODULE           := true
 LOCAL_MODULE_TAGS             := optional
 LOCAL_C_INCLUDES              := external/libdrm \
-                                 $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
+                                 $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include \
+                                 $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include/display
 LOCAL_HEADER_LIBRARIES        := display_headers
 LOCAL_SHARED_LIBRARIES        := libdrm libdl libdisplaydebug
 LOCAL_CFLAGS                  := -DLOG_TAG=\"DRMUTILS\" -Wall  -Werror -fno-operator-names