Cleanup ICD Server BUILD.gn

Signed-off-by: Adrian Gielniewski <adrian.gielniewski@nordicsemi.no>

Author: adigie

src/app/icd/server/BUILD.gn

@@ -87,6 +87,36 @@ if (chip_enable_icd_checkin || chip_build_tests) {
 
     public_deps = [ ":check-in-back-off" ]
   }
+
+  # ICDMonitoringTable source-set is broken out of the main source-set to enable unit tests
+  # All sources and configurations used by the ICDMonitoringTable need to go in this source-set
+  source_set("monitoring-table") {
+    sources = [
+      "ICDMonitoringTable.cpp",
+      "ICDMonitoringTable.h",
+    ]
+
+    public_deps = [
+      "${chip_root}/src/lib/core",
+      "${chip_root}/src/platform:platform",
+    ]
+  }
+
+  source_set("sender") {
+    sources = [
+      "ICDCheckInSender.cpp",
+      "ICDCheckInSender.h",
+    ]
+
+    public_deps = [
+      ":configuration-data",
+      ":monitoring-table",
+      ":notifier",
+      "${chip_root}/src/credentials:credentials",
+      "${chip_root}/src/lib/address_resolve:address_resolve",
+      "${chip_root}/src/protocols/secure_channel",
+    ]
+  }
 }
 
 # ICD Manager source-set is broken out of the main source-set to enable unit tests
@@ -121,40 +151,6 @@ source_set("manager") {
   }
 }
 
-if (chip_enable_icd_checkin) {
-  source_set("sender") {
-    sources = [
-      "ICDCheckInSender.cpp",
-      "ICDCheckInSender.h",
-    ]
-
-    public_deps = [
-      ":configuration-data",
-      ":monitoring-table",
-      ":notifier",
-      "${chip_root}/src/credentials:credentials",
-      "${chip_root}/src/lib/address_resolve:address_resolve",
-      "${chip_root}/src/protocols/secure_channel",
-    ]
-  }
-}
-
-# ICDMonitoringTable source-set is broken out of the main source-set to enable unit tests
-# All sources and configurations used by the ICDMonitoringTable need to go in this source-set
-if (chip_enable_icd_checkin || chip_build_tests) {
-  source_set("monitoring-table") {
-    sources = [
-      "ICDMonitoringTable.cpp",
-      "ICDMonitoringTable.h",
-    ]
-
-    public_deps = [
-      "${chip_root}/src/lib/core",
-      "${chip_root}/src/platform:platform",
-    ]
-  }
-}
-
 source_set("configuration-data") {
   sources = [
     "ICDConfigurationData.cpp",