From 281b0cd1491cf19f2f3aa9ef73866a30c0f70cae Mon Sep 17 00:00:00 2001
From: Mathieu Kardous <mathieu.kardous@silabs.com>
Date: Tue, 23 Jan 2024 15:57:28 -0500
Subject: [PATCH] merge controller-dynamic back into interaction model

---
 src/app/BUILD.gn | 33 ++++++++++++++-------------------
 1 file changed, 14 insertions(+), 19 deletions(-)

diff --git a/src/app/BUILD.gn b/src/app/BUILD.gn
index c784876bf845e6..ff2bc994e0e7ac 100644
--- a/src/app/BUILD.gn
+++ b/src/app/BUILD.gn
@@ -184,23 +184,6 @@ config("config-controller-dynamic-server") {
   ]
 }
 
-source_set("controller-dynamic-server") {
-  sources = [
-    "clusters/ota-provider/ota-provider.cpp",
-    "dynamic_server/AccessControl.cpp",
-    "dynamic_server/AccessControl.h",
-    "dynamic_server/DynamicDispatcher.cpp",
-  ]
-
-  public_deps = [
-    ":global-attributes",
-    ":interaction-model",
-    "${chip_root}/src/access",
-  ]
-
-  public_configs = [ ":config-controller-dynamic-server" ]
-}
-
 source_set("interaction-model") {
   sources = [
     "CASEClient.cpp",
@@ -255,10 +238,22 @@ source_set("interaction-model") {
     "${chip_root}/src/system",
   ]
 
-  deps = []
+  public_configs = []
 
   if (chip_build_controller_dynamic_server) {
-    public_deps += [ ":controller-dynamic-server" ]
+    sources += [
+      "clusters/ota-provider/ota-provider.cpp",
+      "dynamic_server/AccessControl.cpp",
+      "dynamic_server/AccessControl.h",
+      "dynamic_server/DynamicDispatcher.cpp",
+    ]
+
+    public_deps += [
+      ":global-attributes",
+      "${chip_root}/src/access",
+    ]
+
+    public_configs += [ ":config-controller-dynamic-server" ]
   }
 }