ICDHandler initialization

src/app/icd/BUILD.gn

@@ -36,17 +36,13 @@ source_set("manager") {
   sources = [
     "ICDManager.cpp",
     "ICDManager.h",
-    "ICDHandler.cpp",
-    "ICDHandler.h",
   ]
 
   public_deps = [
     ":cluster",
     ":notifier",
     ":observer",
     "${chip_root}/src/credentials:credentials",
-    "${chip_root}/src/lib/core",
-    "${chip_root}/src/protocols",
   ]
 }
 
@@ -68,3 +64,18 @@ source_set("cluster") {
     "${chip_root}/src/protocols:im_status",
   ]
 }
+
+# ICD Handler source-set is broken out of the main source-set to enable unit tests
+# All sources and configurations used by the ICDHandler need to go in this source-set
+source_set("handler") {
+  sources = [
+    "ICDHandler.cpp",
+    "ICDHandler.h",
+  ]
+
+  public_deps = [
+    "${chip_root}/src/lib/core",
+    "${chip_root}/src/protocols",
+    "${chip_root}/src/messaging",
+  ]
+}