Fix dynamic cluster dispatcher in controller

joonhaengHeo · Oct 5, 2023 · 72d7201 · 72d7201
1 parent 68d69cb
commit 72d7201
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 4 deletions.
diff --git a/src/app/BUILD.gn b/src/app/BUILD.gn
@@ -18,6 +18,7 @@ import("${chip_root}/build/chip/buildconfig_header.gni")
 import("${chip_root}/src/platform/device.gni")
 import("common_flags.gni")
 import("icd/icd.gni")
+import("${chip_root}/src/lib/core/core.gni")
 
 declare_args() {
   # Enable strict schema checks.
@@ -210,7 +211,6 @@ static_library("app") {
 
   if (chip_build_controller_dynamic_server) {
     defines = [
-      "CHIP_CONFIG_SKIP_APP_SPECIFIC_GENERATED_HEADER_INCLUDES=1",
       "CHIP_DEVICE_CONFIG_DYNAMIC_ENDPOINT_COUNT=1",
     ]
     sources += [

diff --git a/src/app/common_flags.gni b/src/app/common_flags.gni
@@ -16,5 +16,4 @@ declare_args() {
   # Temporary flag for interaction model and echo protocols, set it to true to enable
   chip_app_use_echo = false
   chip_enable_read_client = true
-  chip_build_controller_dynamic_server = false
 }
diff --git a/src/controller/java/BUILD.gn b/src/controller/java/BUILD.gn
@@ -17,7 +17,7 @@ import("//build_overrides/chip.gni")
 import("${chip_root}/build/chip/java/config.gni")
 import("${chip_root}/build/chip/java/rules.gni")
 import("${chip_root}/build/chip/tests.gni")
-import("${chip_root}/src/app/common_flags.gni")
+import("${chip_root}/src/lib/core/core.gni")
 import("${chip_root}/src/platform/device.gni")
 
 if (!matter_enable_java_compilation) {
@@ -63,7 +63,6 @@ shared_library("jni") {
   ]
 
   deps = [
-    "${chip_root}/src/controller/data_model",
     "${chip_root}/src/credentials:default_attestation_verifier",
     "${chip_root}/src/inet",
     "${chip_root}/src/lib",
@@ -96,6 +95,8 @@ shared_library("jni") {
 
   if (chip_build_controller_dynamic_server) {
     defines += [ "CHIP_DEVICE_CONFIG_DYNAMIC_SERVER" ]
+    deps += [ "${chip_root}/src/controller:nodatamodel" ]
+
   }
 
   if (matter_enable_java_compilation) {

diff --git a/src/lib/core/BUILD.gn b/src/lib/core/BUILD.gn
@@ -66,6 +66,8 @@ buildconfig_header("chip_buildconfig") {
     "CHIP_CONFIG_MINMDNS_MAX_PARALLEL_RESOLVES=${chip_config_minmdns_max_parallel_resolves}",
     "CHIP_CONFIG_CANCELABLE_HAS_INFO_STRING_FIELD=${chip_config_cancelable_has_info_string_field}",
     "CHIP_CONFIG_BIG_ENDIAN_TARGET=${chip_target_is_big_endian}",
+    "CHIP_CONFIG_SKIP_APP_SPECIFIC_GENERATED_HEADER_INCLUDES=${chip_build_controller_dynamic_server}",
+
   ]
 }
 

diff --git a/src/lib/core/core.gni b/src/lib/core/core.gni
@@ -91,6 +91,9 @@ declare_args() {
 
   # Whether the target architecture is big-endian (true) or little-endian (false).
   chip_target_is_big_endian = false
+
+  # dynamic cluster servers for controller
+  chip_build_controller_dynamic_server = false
 }
 
 if (chip_target_style == "") {