Skip to content

Commit 06f910c

Browse files
Remove more commented build code
1 parent 3661fb5 commit 06f910c

File tree

2 files changed

+2
-11
lines changed

2 files changed

+2
-11
lines changed

src/app/chip_data_model.cmake

+2-9
Original file line numberDiff line numberDiff line change
@@ -133,14 +133,6 @@ function(chip_configure_data_model APP_TARGET)
133133
${CHIP_APP_BASE_DIR}/icd/server/ICDConfigurationData.cpp
134134
)
135135

136-
# This is:
137-
# //src/app/common:cluster-objects
138-
#
139-
# TODO: ideally we would avoid duplication and would link gn-built items
140-
target_sources(${APP_TARGET} ${SCOPE}
141-
# ${CHIP_APP_BASE_DIR}/../../zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp
142-
)
143-
144136
chip_zapgen(${APP_TARGET}-zapgen
145137
INPUT "${ARG_ZAP_FILE}"
146138
GENERATOR "app-templates"
@@ -156,7 +148,6 @@ function(chip_configure_data_model APP_TARGET)
156148
add_dependencies(${APP_TARGET} ${APP_TARGET}-zapgen)
157149

158150
target_sources(${APP_TARGET} ${SCOPE}
159-
# ${CHIP_APP_BASE_DIR}/../../zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp
160151
${CHIP_APP_BASE_DIR}/reporting/reporting.cpp
161152
${CHIP_APP_BASE_DIR}/util/attribute-storage.cpp
162153
${CHIP_APP_BASE_DIR}/util/attribute-table.cpp
@@ -177,11 +168,13 @@ function(chip_configure_data_model APP_TARGET)
177168
if(ARG_EXTERNAL_APP_COMMON)
178169
target_sources(${APP_TARGET} ${SCOPE}
179170
${ARG_EXTERNAL_APP_COMMON}/app-common/zap-generated/attributes/Accessors.cpp
171+
# TODO: ideally we would avoid duplication and would link gn-built items
180172
${ARG_EXTERNAL_APP_COMMON}/app-common/zap-generated/cluster-objects.cpp
181173
)
182174
else()
183175
target_sources(${APP_TARGET} ${SCOPE}
184176
${CHIP_APP_BASE_DIR}/../../zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp
177+
# TODO: ideally we would avoid duplication and would link gn-built items
185178
${CHIP_APP_BASE_DIR}/../../zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp
186179
)
187180
endif()

src/app/chip_data_model.gni

-2
Original file line numberDiff line numberDiff line change
@@ -199,8 +199,6 @@ template("chip_data_model") {
199199
"${_app_root}/util/binding-table.h",
200200
"${_app_root}/util/generic-callback-stubs.cpp",
201201
"${_app_root}/util/privilege-storage.cpp",
202-
203-
# "${chip_root}/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp",
204202
]
205203

206204
if (defined(external_app_common)) {

0 commit comments

Comments
 (0)