Skip to content

Commit 5ee8508

Browse files
committed
Fix some define forwarding logic in codegen
1 parent c30b77a commit 5ee8508

File tree

2 files changed

+12
-6
lines changed

2 files changed

+12
-6
lines changed

build/chip/chip_codegen.gni

+3-4
Original file line numberDiff line numberDiff line change
@@ -80,11 +80,10 @@ template("_chip_build_time_codegen") {
8080

8181
forward_variables_from(invoker, [ "deps" ])
8282

83-
if (defined(deps)) {
84-
deps += [ ":${_name}_codegen" ]
85-
} else {
86-
deps = [ ":${_name}_codegen" ]
83+
if (!defined(deps)) {
84+
deps = []
8785
}
86+
deps += [ ":${_name}_codegen" ]
8887
}
8988
}
9089

src/app/chip_data_model.gni

+9-2
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,11 @@ template("chip_data_model") {
7070

7171
public_configs = [ ":${_data_model_name}_config" ]
7272

73-
deps = [ "${chip_root}/src/app/common:cluster-objects" ]
73+
if (!defined(deps)) {
74+
deps = []
75+
}
76+
77+
deps += [ "${chip_root}/src/app/common:cluster-objects" ]
7478
}
7579

7680
_use_default_im_dispatch = !defined(invoker.use_default_im_dispatch) ||
@@ -89,7 +93,10 @@ template("chip_data_model") {
8993
sources = []
9094
}
9195

92-
deps = [ ":${_data_model_name}_codegen" ]
96+
if (!defined(deps)) {
97+
deps = []
98+
}
99+
deps += [ ":${_data_model_name}_codegen" ]
93100

94101
sources += [
95102
"${_app_root}/clusters/barrier-control-server/barrier-control-server.h",

0 commit comments

Comments
 (0)