tee-supplicant: fix build with kernel < 4.16

Commit 3ac968e moved linux/tee.h from libteec/include to libteec/src resulting in the following build failure with any kernel < 4.16 (i.e before torvalds/linux@033ddf1): /home/buildroot/autobuild/instance-3/output-1/build/optee-client-4.0.0/tee-supplicant/src/tee_supplicant.c: In function 'register_local_shm': /home/buildroot/autobuild/instance-3/output-1/build/optee-client-4.0.0/tee-supplicant/src/tee_supplicant.c:356:44: error: storage size of 'data' isn't known 356 | struct tee_ioctl_shm_register_data data; | ^~~~ To fix this build failure, update CMakeLists.txt and Makefile of tee-supplicant to add libteec/src to the include directories. Fixes: 3ac968e ("Makefile, cmake: move teec related headers") Signed-off-by: Fabrice Fontaine <[email protected]>
OP-TEE · Jan 8, 2024 · d5e05e1 · d5e05e1
1 parent 98dc4f4
commit d5e05e1
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/tee-supplicant/CMakeLists.txt b/tee-supplicant/CMakeLists.txt
@@ -93,7 +93,10 @@ endif()
 ################################################################################
 # Public and private header and library dependencies
 ################################################################################
-target_include_directories(${PROJECT_NAME} PRIVATE src)
+target_include_directories(${PROJECT_NAME}
+	PRIVATE src
+	PRIVATE ../libteec/src
+)
 
 target_link_libraries(${PROJECT_NAME}
 	PRIVATE teec

diff --git a/tee-supplicant/Makefile b/tee-supplicant/Makefile
@@ -40,7 +40,7 @@ TEES_OBJ_DIR	:= $(OUT_DIR)
 TEES_OBJS 	:= $(patsubst %.c,$(TEES_OBJ_DIR)/%.o, $(TEES_SRCS))
 TEES_INCLUDES 	:= ${CURDIR}/../libteec/include \
 		   ${CURDIR}/src \
-		   ${CURDIR}/../libteec/include \
+		   ${CURDIR}/../libteec/src \
 
 TEES_CFLAGS	:= $(addprefix -I, $(TEES_INCLUDES)) $(CFLAGS) \
 		   -DDEBUGLEVEL_$(CFG_TEE_SUPP_LOG_LEVEL) \

diff --git a/tee-supplicant/tee_supplicant_android.mk b/tee-supplicant/tee_supplicant_android.mk
@@ -54,7 +54,7 @@ ifeq ($(CFG_FTRACE_SUPPORT),y)
 LOCAL_CFLAGS += -DCFG_FTRACE_SUPPORT
 endif
 
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/../libteec/include \
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/../libteec/src \
                     $(LOCAL_PATH)/../libteec/include \
                     $(LOCAL_PATH)/src