Skip to content

Commit df2909b

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 df2909b

File tree

2 files changed

+44
-34
lines changed

2 files changed

+44
-34
lines changed

src/app/chip_data_model.gni

+4-1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import("//build_overrides/build.gni")
1616
import("//build_overrides/chip.gni")
1717
import("${chip_root}/build/chip/chip_codegen.gni")
1818
import("${chip_root}/src/app/common_flags.gni")
19+
import("${chip_root}/src/app/icd/icd.gni")
1920
import("${chip_root}/src/data-model-providers/codegen/model.gni")
2021
import("${chip_root}/src/platform/python.gni")
2122

@@ -340,9 +341,11 @@ template("chip_data_model") {
340341
deps += [
341342
"${chip_root}/src/app/icd/server:configuration-data",
342343
"${chip_root}/src/app/icd/server:icd-server-config",
343-
"${chip_root}/src/app/icd/server:monitoring-table",
344344
"${chip_root}/src/app/icd/server:notifier",
345345
]
346+
if (chip_enable_icd_checkin) {
347+
deps += [ "${chip_root}/src/app/icd/server:monitoring-table" ]
348+
}
346349
} else if (cluster == "resource-monitoring-server") {
347350
sources += [
348351
"${_app_root}/clusters/${cluster}/${cluster}.cpp",

src/app/icd/server/BUILD.gn

+40-33
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
@@ -118,34 +121,38 @@ source_set("manager") {
118121
}
119122
}
120123

121-
source_set("sender") {
122-
sources = [
123-
"ICDCheckInSender.cpp",
124-
"ICDCheckInSender.h",
125-
]
124+
if (chip_enable_icd_checkin) {
125+
source_set("sender") {
126+
sources = [
127+
"ICDCheckInSender.cpp",
128+
"ICDCheckInSender.h",
129+
]
126130

127-
public_deps = [
128-
":configuration-data",
129-
":monitoring-table",
130-
":notifier",
131-
"${chip_root}/src/credentials:credentials",
132-
"${chip_root}/src/lib/address_resolve:address_resolve",
133-
"${chip_root}/src/protocols/secure_channel",
134-
]
131+
public_deps = [
132+
":configuration-data",
133+
":monitoring-table",
134+
":notifier",
135+
"${chip_root}/src/credentials:credentials",
136+
"${chip_root}/src/lib/address_resolve:address_resolve",
137+
"${chip_root}/src/protocols/secure_channel",
138+
]
139+
}
135140
}
136141

137142
# ICDMonitoringTable source-set is broken out of the main source-set to enable unit tests
138143
# 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-
]
144+
if (chip_enable_icd_checkin || chip_build_tests) {
145+
source_set("monitoring-table") {
146+
sources = [
147+
"ICDMonitoringTable.cpp",
148+
"ICDMonitoringTable.h",
149+
]
144150

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

151158
source_set("configuration-data") {

0 commit comments

Comments
 (0)