Remove im-client-callbacks.cpp.

project-chip · Jan 29, 2022 · 08f45b6 · 08f45b6
1 parent c819a9b
commit 08f45b6
Show file tree

Hide file tree

Showing 14 changed files with 1 addition and 419 deletions.
diff --git a/examples/all-clusters-app/all-clusters-common/BUILD.gn b/examples/all-clusters-app/all-clusters-common/BUILD.gn
@@ -22,5 +22,4 @@ chip_data_model("all-clusters-common") {
   zap_pregenerated_dir =
       "${chip_root}/zzz_generated/all-clusters-app/zap-generated"
   is_server = true
-  use_default_client_callbacks = true
 }
diff --git a/examples/lighting-app/mbed/CMakeLists.txt b/examples/lighting-app/mbed/CMakeLists.txt
@@ -54,7 +54,6 @@ target_sources(${APP_TARGET} PRIVATE
 )
 
 chip_configure_data_model(${APP_TARGET}
-    INCLUDE_CLIENT_CALLBACKS
     INCLUDE_SERVER
     ZAP_FILE ${CMAKE_CURRENT_SOURCE_DIR}/../lighting-common/lighting-app.zap
     GEN_DIR ${GEN_DIR}/lighting-app/zap-generated

diff --git a/examples/lighting-app/nrfconnect/CMakeLists.txt b/examples/lighting-app/nrfconnect/CMakeLists.txt
@@ -95,7 +95,6 @@ target_sources(app PRIVATE
                ${CHIP_ROOT}/src/app/clusters/ota-requestor/BDXDownloader.cpp)
 
 chip_configure_data_model(app
-    INCLUDE_CLIENT_CALLBACKS
     INCLUDE_SERVER
     ZAP_FILE ${CMAKE_CURRENT_SOURCE_DIR}/../lighting-common/lighting-app.zap
     GEN_DIR ${GEN_DIR}/lighting-app/zap-generated

diff --git a/examples/ota-requestor-app/ameba/chip_main.cmake b/examples/ota-requestor-app/ameba/chip_main.cmake
@@ -25,7 +25,6 @@ list(
     ${chip_dir}/src/app/clusters/ota-requestor/BDXDownloader.cpp
     ${chip_dir}/src/app/clusters/ota-requestor/OTARequestor.cpp
     ${chip_dir}/src/app/clusters/ota-requestor/ota-requestor-server.cpp
-    ${chip_dir}/src/app/util/im-client-callbacks.cpp
 )
 
 add_library(

diff --git a/examples/ota-requestor-app/mbed/CMakeLists.txt b/examples/ota-requestor-app/mbed/CMakeLists.txt
@@ -59,7 +59,6 @@ target_sources(${APP_TARGET} PRIVATE
 
 chip_configure_data_model(${APP_TARGET}
     INCLUDE_SERVER
-    INCLUDE_CLIENT_CALLBACKS
     ZAP_FILE ${CHIP_ROOT}/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.zap
     GEN_DIR ${CHIP_ROOT}/zzz_generated/ota-requestor-app/zap-generated
 )

diff --git a/examples/ota-requestor-app/ota-requestor-common/BUILD.gn b/examples/ota-requestor-app/ota-requestor-common/BUILD.gn
@@ -26,8 +26,6 @@ chip_data_model("ota-requestor-common") {
   zap_pregenerated_dir =
       "${chip_root}/zzz_generated/ota-requestor-app/zap-generated"
 
-  use_default_client_callbacks = true
-
   deps = [ "${chip_root}/src/lib" ]
 
   public_configs = [ ":config" ]

diff --git a/examples/tv-app/tv-common/BUILD.gn b/examples/tv-app/tv-common/BUILD.gn
@@ -21,5 +21,4 @@ chip_data_model("tv-common") {
 
   zap_pregenerated_dir = "${chip_root}/zzz_generated/tv-app/zap-generated"
   is_server = true
-  use_default_client_callbacks = true
 }
diff --git a/examples/tv-casting-app/tv-casting-common/BUILD.gn b/examples/tv-casting-app/tv-casting-common/BUILD.gn
@@ -22,5 +22,4 @@ chip_data_model("tv-casting-common") {
   zap_pregenerated_dir =
       "${chip_root}/zzz_generated/tv-casting-app/zap-generated"
   is_server = true
-  use_default_client_callbacks = true
 }
diff --git a/src/app/chip_data_model.cmake b/src/app/chip_data_model.cmake
@@ -54,13 +54,7 @@ endfunction()
 #                   supported by the application.
 #
 function(chip_configure_data_model APP_TARGET)
-    cmake_parse_arguments(ARG "INCLUDE_CLIENT_CALLBACKS;INCLUDE_SERVER" "ZAP_FILE;GEN_DIR" "" ${ARGN})
-
-    if (ARG_INCLUDE_CLIENT_CALLBACKS)
-        target_sources(${APP_TARGET} PRIVATE
-            ${CHIP_APP_BASE_DIR}/util/im-client-callbacks.cpp
-        )
-    endif()
+    cmake_parse_arguments(ARG "INCLUDE_SERVER" "ZAP_FILE;GEN_DIR" "" ${ARGN})
 
     if (ARG_INCLUDE_SERVER)
         target_sources(${APP_TARGET} PRIVATE

diff --git a/src/app/chip_data_model.gni b/src/app/chip_data_model.gni
@@ -35,9 +35,6 @@ _zap_cluster_list_script = get_path_info("zap_cluster_list.py", "abspath")
 #    Names of the clusters directories to compile.
 #    Deprecated, specify zap_file instead.
 #
-#  use_default_client_callbacks
-#    Include im-client-callbacks.cpp.
-#
 # Forwards all the remaining variables to the source_set.
 #
 template("chip_data_model") {
@@ -56,18 +53,13 @@ template("chip_data_model") {
 
   _use_tests_apis = defined(invoker.use_tests_apis) && invoker.use_tests_apis
 
-  _use_default_client_callbacks =
-      defined(invoker.use_default_client_callbacks) &&
-      invoker.use_default_client_callbacks
-
   source_set(_data_model_name) {
     forward_variables_from(invoker,
                            "*",
                            [
                              "zap_pregenerated_dir",
                              "cluster_sources",
                              "zap_file",
-                             "use_default_client_callbacks",
                              "is_server",
                            ])
 
@@ -172,10 +164,6 @@ template("chip_data_model") {
         sources += [ "${invoker.zap_pregenerated_dir}/CHIPClusters.h" ]
       }
 
-      if (_use_default_client_callbacks) {
-        sources += [ "${_app_root}/util/im-client-callbacks.cpp" ]
-      }
-
       if (_use_default_im_dispatch) {
         sources +=
             [ "${invoker.zap_pregenerated_dir}/IMClusterCommandHandler.cpp" ]