Skip to content

Commit

Permalink
Remove deprecated cluster_sources from chip_data_model (#21005)
Browse files Browse the repository at this point in the history
  • Loading branch information
andy31415 authored and pull[bot] committed Aug 29, 2023
1 parent f297329 commit 1134816
Showing 1 changed file with 1 addition and 8 deletions.
9 changes: 1 addition & 8 deletions src/app/chip_data_model.gni
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,6 @@ _zap_cluster_list_script = get_path_info("zap_cluster_list.py", "abspath")
# zap_file
# Path to the ZAP input file.
#
# cluster_sources
# Names of the clusters directories to compile.
# Deprecated, specify zap_file instead.
#
# Forwards all the remaining variables to the source_set.
#
template("chip_data_model") {
Expand All @@ -56,7 +52,6 @@ template("chip_data_model") {
"*",
[
"zap_pregenerated_dir",
"cluster_sources",
"zap_file",
"is_server",
])
Expand Down Expand Up @@ -93,9 +88,7 @@ template("chip_data_model") {
"${chip_root}/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp",
]

if (defined(invoker.cluster_sources)) {
_cluster_sources = invoker.cluster_sources
} else if (defined(invoker.zap_file)) {
if (defined(invoker.zap_file)) {
_zap_path = rebase_path(invoker.zap_file, root_build_dir)
_script_path = rebase_path(_zap_cluster_list_script, root_build_dir)
_script_args = [ "--zap_file=" + _zap_path ]
Expand Down

0 comments on commit 1134816

Please sign in to comment.