ICDHandler initialization

project-chip · Dec 3, 2023 · 0f402c4 · 0f402c4
1 parent d8af437
commit 0f402c4
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 17 deletions.
diff --git a/src/app/icd/BUILD.gn b/src/app/icd/BUILD.gn
@@ -110,19 +110,3 @@ source_set("configuration-data") {
 
   deps = [ "${chip_root}/src/lib/core" ]
 }
-
-# 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/app/icd/client:manager",
-    "${chip_root}/src/lib/core",
-    "${chip_root}/src/messaging",
-    "${chip_root}/src/protocols",
-  ]
-}
diff --git a/src/app/icd/client/BUILD.gn b/src/app/icd/client/BUILD.gn
@@ -31,3 +31,17 @@ source_set("manager") {
     "${chip_root}/src/protocols",
   ]
 }
+# 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/messaging",
+    "${chip_root}/src/protocols",
+  ]
+}
diff --git a/src/app/icd/ICDHandler.cpp → src/app/icd/client/ICDHandler.cpp b/src/app/icd/ICDHandler.cpp → src/app/icd/client/ICDHandler.cpp
diff --git a/src/app/icd/ICDHandler.h → src/app/icd/client/ICDHandler.h b/src/app/icd/ICDHandler.h → src/app/icd/client/ICDHandler.h
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#include <client/DefaultICDClientStorage.h>
+#include <DefaultICDClientStorage.h>
 #include <lib/support/logging/CHIPLogging.h>
 #include <messaging/ExchangeContext.h>
 #include <messaging/ExchangeMgr.h>