| Andrew Geissler | 2edf064 | 2023-09-11 08:24:07 -0400 | [diff] [blame^] | 1 | From b298400a5783453f64d8bebbd92db2c84c4a49fd Mon Sep 17 00:00:00 2001 |
| 2 | From: Ross Burton <ross.burton@arm.com> |
| 3 | Date: Mon, 10 Jul 2023 14:09:16 +0100 |
| 4 | Subject: [PATCH] OPTEE Private Includes |
| 5 | |
| Andrew Geissler | 23e0279 | 2023-07-21 09:06:10 -0500 | [diff] [blame] | 6 | Change the optee module includes to be private instead of public, so they don't get used |
| 7 | in every build, which can result in compile failures as /core/include/ doesn't exit. |
| 8 | |
| 9 | For some reason this behaviour isn't deterministic, a ticket has been filed with upstream. |
| 10 | |
| 11 | Upstream-Status: Pending |
| 12 | Signed-off-by: Ross Burton <ross.burton@arm.com> |
| Andrew Geissler | 2edf064 | 2023-09-11 08:24:07 -0400 | [diff] [blame^] | 13 | --- |
| 14 | module/optee/console/CMakeLists.txt | 2 +- |
| 15 | module/optee/mbx/CMakeLists.txt | 2 +- |
| 16 | 2 files changed, 2 insertions(+), 2 deletions(-) |
| Andrew Geissler | 23e0279 | 2023-07-21 09:06:10 -0500 | [diff] [blame] | 17 | |
| 18 | diff --git a/module/optee/console/CMakeLists.txt b/module/optee/console/CMakeLists.txt |
| Andrew Geissler | 2edf064 | 2023-09-11 08:24:07 -0400 | [diff] [blame^] | 19 | index aebb7cc79766..942aa98c85ff 100644 |
| Andrew Geissler | 23e0279 | 2023-07-21 09:06:10 -0500 | [diff] [blame] | 20 | --- a/module/optee/console/CMakeLists.txt |
| 21 | +++ b/module/optee/console/CMakeLists.txt |
| 22 | @@ -14,7 +14,7 @@ target_include_directories(${SCP_MODULE_TARGET} |
| 23 | # Those includes are needed for mutex definitnion that is used in optee_smt |
| 24 | # notification |
| 25 | target_include_directories(${SCP_MODULE_TARGET} |
| 26 | - PUBLIC "${SCP_OPTEE_DIR}/core/arch/arm/include/" |
| 27 | + PRIVATE "${SCP_OPTEE_DIR}/core/arch/arm/include/" |
| 28 | "${SCP_OPTEE_DIR}/core/include/" |
| 29 | "${SCP_OPTEE_DIR}/lib/libutils/ext/include/" |
| 30 | "${SCP_OPTEE_DIR}/lib/libutee/include/") |
| 31 | diff --git a/module/optee/mbx/CMakeLists.txt b/module/optee/mbx/CMakeLists.txt |
| Andrew Geissler | 2edf064 | 2023-09-11 08:24:07 -0400 | [diff] [blame^] | 32 | index 305fa42b7370..783a7970c2d5 100644 |
| Andrew Geissler | 23e0279 | 2023-07-21 09:06:10 -0500 | [diff] [blame] | 33 | --- a/module/optee/mbx/CMakeLists.txt |
| 34 | +++ b/module/optee/mbx/CMakeLists.txt |
| 35 | @@ -15,7 +15,7 @@ target_include_directories(${SCP_MODULE_TARGET} |
| 36 | # Those includes are needed for mutex defifitnion that is used in optee_smt |
| 37 | # notification |
| 38 | target_include_directories(${SCP_MODULE_TARGET} |
| 39 | - PUBLIC "${SCP_OPTEE_DIR}/core/include/" |
| 40 | + PRIVATE "${SCP_OPTEE_DIR}/core/include/" |
| 41 | "${SCP_OPTEE_DIR}/lib/libutils/ext/include/" |
| 42 | "${SCP_OPTEE_DIR}/lib/libutee/include/") |
| 43 | |