Skip to content

Commit 986cea4

Browse files
committed
Fix ICD source sets
Don't create ICD Check-In related source sets if `chip_enable_icd_checkin` is disabled. Signed-off-by: Adrian Gielniewski <adrian.gielniewski@nordicsemi.no>
1 parent e0320f9 commit 986cea4

File tree

2 files changed

+34
-22
lines changed

2 files changed

+34
-22
lines changed

src/app/chip_data_model.gni

+5-1
Original file line numberDiff line numberDiff line change
@@ -340,9 +340,13 @@ template("chip_data_model") {
340340
deps += [
341341
"${chip_root}/src/app/icd/server:configuration-data",
342342
"${chip_root}/src/app/icd/server:icd-server-config",
343-
"${chip_root}/src/app/icd/server:monitoring-table",
344343
"${chip_root}/src/app/icd/server:notifier",
345344
]
345+
if(chip_enable_icd_checkin) {
346+
deps += [
347+
"${chip_root}/src/app/icd/server:monitoring-table",
348+
]
349+
}
346350
} else if (cluster == "resource-monitoring-server") {
347351
sources += [
348352
"${_app_root}/clusters/${cluster}/${cluster}.cpp",

src/app/icd/server/BUILD.gn

+29-21
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414

1515
import("//build_overrides/chip.gni")
1616
import("${chip_root}/build/chip/buildconfig_header.gni")
17+
import("${chip_root}/build/chip/tests.gni")
1718
import("${chip_root}/src/app/icd/icd.gni")
1819

1920
# ICD Server sources and configurations
@@ -70,20 +71,22 @@ source_set("notifier") {
7071
]
7172
}
7273

73-
source_set("check-in-back-off") {
74-
sources = [ "ICDCheckInBackOffStrategy.h" ]
74+
if (chip_enable_icd_checkin || chip_build_tests) {
75+
source_set("check-in-back-off") {
76+
sources = [ "ICDCheckInBackOffStrategy.h" ]
7577

76-
public_deps = [
77-
":monitoring-table",
78-
"${chip_root}/src/lib/core",
79-
"${chip_root}/src/lib/support",
80-
]
81-
}
78+
public_deps = [
79+
":monitoring-table",
80+
"${chip_root}/src/lib/core",
81+
"${chip_root}/src/lib/support",
82+
]
83+
}
8284

83-
source_set("default-check-in-back-off") {
84-
sources = [ "DefaultICDCheckInBackOffStrategy.h" ]
85+
source_set("default-check-in-back-off") {
86+
sources = [ "DefaultICDCheckInBackOffStrategy.h" ]
8587

86-
public_deps = [ ":check-in-back-off" ]
88+
public_deps = [ ":check-in-back-off" ]
89+
}
8790
}
8891

8992
# ICD Manager source-set is broken out of the main source-set to enable unit tests
@@ -126,26 +129,31 @@ source_set("sender") {
126129

127130
public_deps = [
128131
":configuration-data",
129-
":monitoring-table",
130132
":notifier",
131133
"${chip_root}/src/credentials:credentials",
132134
"${chip_root}/src/lib/address_resolve:address_resolve",
133135
"${chip_root}/src/protocols/secure_channel",
134136
]
137+
138+
if (chip_enable_icd_checkin) {
139+
public_deps += [ ":monitoring-table" ]
140+
}
135141
}
136142

137143
# ICDMonitoringTable source-set is broken out of the main source-set to enable unit tests
138144
# All sources and configurations used by the ICDMonitoringTable need to go in this source-set
139-
source_set("monitoring-table") {
140-
sources = [
141-
"ICDMonitoringTable.cpp",
142-
"ICDMonitoringTable.h",
143-
]
145+
if (chip_enable_icd_checkin || chip_build_tests) {
146+
source_set("monitoring-table") {
147+
sources = [
148+
"ICDMonitoringTable.cpp",
149+
"ICDMonitoringTable.h",
150+
]
144151

145-
public_deps = [
146-
"${chip_root}/src/lib/core",
147-
"${chip_root}/src/platform:platform",
148-
]
152+
public_deps = [
153+
"${chip_root}/src/lib/core",
154+
"${chip_root}/src/platform:platform",
155+
]
156+
}
149157
}
150158

151159
source_set("configuration-data") {

0 commit comments

Comments
 (0)