From 86873e2b3c76d7fdabcd113af9807cf43c880919 Mon Sep 17 00:00:00 2001 From: Frazer Carsley Date: Wed, 9 Jul 2025 13:23:01 +0100 Subject: [PATCH] OPTEE Private Includes. Change the optee module includes to be private instead of public, so they don't get used in every build, which can result in compile failures as /core/include/ doesn't exit. For some reason this behaviour isn't deterministic. Signed-off-by: Ross Burton Signed-off-by: Frazer Carsley --- product/optee/common/module/console/CMakeLists.txt | 4 ++-- product/optee/common/module/mbx/CMakeLists.txt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/product/optee/common/module/console/CMakeLists.txt b/product/optee/common/module/console/CMakeLists.txt index aebb7cc79..0e8001e3c 100644 --- a/product/optee/common/module/console/CMakeLists.txt +++ b/product/optee/common/module/console/CMakeLists.txt @@ -1,6 +1,6 @@ # # Arm SCP/MCP Software -# Copyright (c) 2022, Linaro Limited and Contributors. All rights reserved. +# Copyright (c) 2022-2025, Linaro Limited and Contributors. All rights reserved. # # SPDX-License-Identifier: BSD-3-Clause # @@ -14,7 +14,7 @@ target_include_directories(${SCP_MODULE_TARGET} # Those includes are needed for mutex definitnion that is used in optee_smt # notification target_include_directories(${SCP_MODULE_TARGET} - PUBLIC "${SCP_OPTEE_DIR}/core/arch/arm/include/" + PRIVATE "${SCP_OPTEE_DIR}/core/arch/arm/include/" "${SCP_OPTEE_DIR}/core/include/" "${SCP_OPTEE_DIR}/lib/libutils/ext/include/" "${SCP_OPTEE_DIR}/lib/libutee/include/") diff --git a/product/optee/common/module/mbx/CMakeLists.txt b/product/optee/common/module/mbx/CMakeLists.txt index 305fa42b7..08fd57fc1 100644 --- a/product/optee/common/module/mbx/CMakeLists.txt +++ b/product/optee/common/module/mbx/CMakeLists.txt @@ -1,6 +1,6 @@ # # Arm SCP/MCP Software -# Copyright (c) 2022, Linaro Limited and Contributors. All rights reserved. +# Copyright (c) 2022-2025, Linaro Limited and Contributors. All rights reserved. # # SPDX-License-Identifier: BSD-3-Clause # @@ -15,7 +15,7 @@ target_include_directories(${SCP_MODULE_TARGET} # Those includes are needed for mutex defifitnion that is used in optee_smt # notification target_include_directories(${SCP_MODULE_TARGET} - PUBLIC "${SCP_OPTEE_DIR}/core/include/" + PRIVATE "${SCP_OPTEE_DIR}/core/include/" "${SCP_OPTEE_DIR}/lib/libutils/ext/include/" "${SCP_OPTEE_DIR}/lib/libutee/include/") -- GitLab