Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove deprecated cluster_sources from chip_data_model #21005

Merged
merged 1 commit into from
Jul 22, 2022
Merged

Remove deprecated cluster_sources from chip_data_model #21005

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 1 addition & 8 deletions src/app/chip_data_model.gni
View file
Open in desktop
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