From c5faac8c718f4bdf8b169ad4d245fade2b0e8928 Mon Sep 17 00:00:00 2001 From: Andrei Litvin Date: Wed, 20 Jul 2022 12:47:10 -0400 Subject: [PATCH] Remove deprecated cluster_sources from chip_data_model --- src/app/chip_data_model.gni | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/src/app/chip_data_model.gni b/src/app/chip_data_model.gni index 47ebd1cd926293..b2b50687503dc5 100644 --- a/src/app/chip_data_model.gni +++ b/src/app/chip_data_model.gni @@ -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") { @@ -56,7 +52,6 @@ template("chip_data_model") { "*", [ "zap_pregenerated_dir", - "cluster_sources", "zap_file", "is_server", ]) @@ -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 ]