Skip to content

Commit 6d73d5b

Browse files
adigienordicjm
authored andcommitted
[nrf fromtree] Add ICDConfigurationData to app sources when ICD management server cluster is included (project-chip#37653)
* Fix ICD management server cluster dependecies Add ICDConfigurationData to app sources when ICD management server cluster is included in sample, but ICD support is disabled, e.g. lock-app on some platforms. Related to: project-chip#32321 Signed-off-by: Adrian Gielniewski <adrian.gielniewski@nordicsemi.no> * Add TODO comments for project-chip#32321 Add TODO comments for issue related to ICD management server. Signed-off-by: Adrian Gielniewski <adrian.gielniewski@nordicsemi.no> --------- Signed-off-by: Adrian Gielniewski <adrian.gielniewski@nordicsemi.no> (cherry picked from commit 00c6f4e)
1 parent 8bb7645 commit 6d73d5b

File tree

2 files changed

+11
-0
lines changed

2 files changed

+11
-0
lines changed

src/app/chip_data_model.cmake

+10
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,16 @@ include("${CHIP_ROOT}/src/app/codegen-data-model-provider/model.cmake")
2828
function(chip_configure_cluster APP_TARGET CLUSTER)
2929
file(GLOB CLUSTER_SOURCES "${CHIP_APP_BASE_DIR}/clusters/${CLUSTER}/*.cpp")
3030
target_sources(${APP_TARGET} PRIVATE ${CLUSTER_SOURCES})
31+
32+
# Add clusters dependencies
33+
if (CLUSTER STREQUAL "icd-management-server")
34+
# TODO(#32321): Remove after issue is resolved
35+
# Add ICDConfigurationData when ICD management server cluster is included,
36+
# but ICD support is disabled, e.g. lock-app on some platforms
37+
if(NOT CONFIG_CHIP_ENABLE_ICD_SUPPORT)
38+
target_sources(${APP_TARGET} PRIVATE ${CHIP_APP_BASE_DIR}/icd/server/ICDConfigurationData.cpp)
39+
endif()
40+
endif()
3141
endfunction()
3242

3343
#

src/app/clusters/icd-management-server/icd-management-server.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -446,6 +446,7 @@ bool emberAfIcdManagementClusterUnregisterClientCallback(CommandHandler * comman
446446
bool emberAfIcdManagementClusterStayActiveRequestCallback(CommandHandler * commandObj, const ConcreteCommandPath & commandPath,
447447
const Commands::StayActiveRequest::DecodableType & commandData)
448448
{
449+
// TODO(#32321): Remove #if after issue is resolved
449450
// Note: We only need this #if statement for platform examples that enable the ICD management server without building the sample
450451
// as an ICD. Since this is not spec compliant, we should remove this #if statement once we stop compiling the ICD management
451452
// server in those examples.

0 commit comments

Comments
 (0)