Fix non CIP builds

project-chip · Jul 24, 2024 · c8b04e7 · c8b04e7
1 parent b10d0bc
commit c8b04e7
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 11 deletions.
diff --git a/src/app/clusters/icd-management-server/icd-management-server.cpp b/src/app/clusters/icd-management-server/icd-management-server.cpp
@@ -106,7 +106,6 @@ CHIP_ERROR IcdManagementAttributeAccess::Read(const ConcreteReadAttributePath &
 
     case IcdManagement::Attributes::MaximumCheckInBackOff::Id:
         return ReadMaximumCheckInBackOff(aPath.mEndpointId, aEncoder);
-
 #endif // CHIP_CONFIG_ENABLE_ICD_CIP
     }
 
@@ -128,11 +127,6 @@ CHIP_ERROR IcdManagementAttributeAccess::ReadActiveModeThreshold(EndpointId endp
     return encoder.Encode(mICDConfigurationData->GetActiveModeThreshold().count());
 }
 
-CHIP_ERROR IcdManagementAttributeAccess::ReadMaximumCheckInBackOff(EndpointId endpoint, AttributeValueEncoder & encoder)
-{
-    return encoder.Encode(mICDConfigurationData->GetMaximumCheckInBackoff().count());
-}
-
 #if CHIP_CONFIG_ENABLE_ICD_CIP
 /**
  * @brief Implementation of Fabric Delegate for ICD Management cluster
@@ -231,6 +225,11 @@ CHIP_ERROR IcdManagementAttributeAccess::ReadClientsSupportedPerFabric(EndpointI
     return encoder.Encode(mICDConfigurationData->GetClientsSupportedPerFabric());
 }
 
+CHIP_ERROR IcdManagementAttributeAccess::ReadMaximumCheckInBackOff(EndpointId endpoint, AttributeValueEncoder & encoder)
+{
+    return encoder.Encode(mICDConfigurationData->GetMaximumCheckInBackoff().count());
+}
+
 /**
  * @brief Function checks if the client has admin permissions to the cluster in the commandPath
  *

diff --git a/src/app/icd/server/BUILD.gn b/src/app/icd/server/BUILD.gn
@@ -93,6 +93,7 @@ source_set("manager") {
   deps = [ ":icd-server-config" ]
 
   public_deps = [
+    ":check-in-back-off",
     ":configuration-data",
     ":notifier",
     ":observer",
@@ -105,7 +106,6 @@ source_set("manager") {
 
   if (chip_enable_icd_checkin) {
     public_deps += [
-      ":check-in-back-off",
       ":monitoring-table",
       ":sender",
       "${chip_root}/src/app:app_config",

diff --git a/src/app/icd/server/ICDManager.h b/src/app/icd/server/ICDManager.h
@@ -21,6 +21,7 @@
 #include <app/AppConfig.h>
 #include <app/SubscriptionsInfoProvider.h>
 #include <app/TestEventTriggerDelegate.h>
+#include <app/icd/server/ICDCheckInBackOffStrategy.h>
 #include <app/icd/server/ICDConfigurationData.h>
 #include <app/icd/server/ICDNotifier.h>
 #include <app/icd/server/ICDStateObserver.h>
@@ -33,10 +34,9 @@
 #include <system/SystemClock.h>
 
 #if CHIP_CONFIG_ENABLE_ICD_CIP
-#include <app/icd/server/ICDCheckInBackOffStrategy.h> // nogncheck
-#include <app/icd/server/ICDCheckInSender.h>          // nogncheck
-#include <app/icd/server/ICDMonitoringTable.h>        // nogncheck
-#endif                                                // CHIP_CONFIG_ENABLE_ICD_CIP
+#include <app/icd/server/ICDCheckInSender.h>   // nogncheck
+#include <app/icd/server/ICDMonitoringTable.h> // nogncheck
+#endif                                         // CHIP_CONFIG_ENABLE_ICD_CIP
 
 namespace chip {
 namespace Crypto {