Remove cluster objects dependency from platform

examples/common/tracing/BUILD.gn

@@ -94,6 +94,7 @@ source_set("trace_handlers_decoder") {
 
   deps = [
     ":trace_handlers",
+    "${chip_root}/src/app/common:cluster-objects",
     "${chip_root}/src/lib",
     "${chip_root}/src/lib/core:types",
   ]
@@ -123,6 +124,7 @@ executable("chip-trace-decoder") {
   deps = [ "${chip_root}/src/platform/logging:stdio" ]
 
   public_deps = [
+    "${chip_root}/src/app/common:cluster-objects",
     "${chip_root}/src/lib",
     "${chip_root}/src/lib/core:types",
     "${chip_root}/third_party/jsoncpp",

examples/platform/esp32/external_platform/ESP32_custom/BUILD.gn

@@ -98,6 +98,7 @@ static_library("ESP32_custom") {
   ]
 
   deps = [
+    "${chip_root}/src/app:app_config",
     "${chip_root}/src/lib/dnssd:platform_header",
     "${chip_root}/src/platform/logging:headers",
     "${chip_root}/src/setup_payload",

src/access/BUILD.gn

@@ -43,6 +43,7 @@ source_set("types") {
 
   public_deps = [
     ":access_config",
+    "${chip_root}/src/app:app_config",
     "${chip_root}/src/lib/core",
     "${chip_root}/src/lib/core:types",
   ]
@@ -76,6 +77,7 @@ static_library("access") {
       "AccessRestrictionProvider.cpp",
       "AccessRestrictionProvider.h",
     ]
+    public_deps += [ "${chip_root}/src/app/common:cluster-objects" ]
   }
 }
 

src/app/BUILD.gn

@@ -219,6 +219,7 @@ static_library("interaction-model") {
     ":event-reporter",
     ":paths",
     ":subscription-info-provider",
+    "${chip_root}/src/access",
     "${chip_root}/src/app/MessageDef",
     "${chip_root}/src/app/data-model-provider",
     "${chip_root}/src/app/icd/server:icd-server-config",
@@ -350,6 +351,7 @@ source_set("status-response") {
     ":constants",
     "${chip_root}/src/app/MessageDef",
     "${chip_root}/src/messaging",
+    "${chip_root}/src/protocols/interaction_model",
   ]
 }
 
@@ -387,6 +389,7 @@ source_set("command-handler-impl") {
     ":status-response",
     "${chip_root}/src/access:types",
     "${chip_root}/src/app/MessageDef",
+    "${chip_root}/src/app/common:cluster-objects",
     "${chip_root}/src/app/data-model",
     "${chip_root}/src/app/data-model-provider",
     "${chip_root}/src/app/util:callbacks",

src/app/MessageDef/BUILD.gn

@@ -116,6 +116,7 @@ source_set("MessageDef") {
     "${chip_root}/src/app:constants",
     "${chip_root}/src/app:events",
     "${chip_root}/src/app:paths",
+    "${chip_root}/src/app/data-model",
     "${chip_root}/src/lib/core",
     "${chip_root}/src/lib/support",
     "${chip_root}/src/protocols/interaction_model",

src/app/data-model-provider/BUILD.gn

@@ -35,6 +35,7 @@ source_set("data-model-provider") {
     "${chip_root}/src/app:events",
     "${chip_root}/src/app:paths",
     "${chip_root}/src/app/MessageDef",
+    "${chip_root}/src/app/common:cluster-objects",
     "${chip_root}/src/app/data-model",
     "${chip_root}/src/lib/core",
     "${chip_root}/src/lib/core:error",

src/app/icd/server/BUILD.gn

@@ -102,6 +102,7 @@ source_set("manager") {
     ":observer",
     "${chip_root}/src/app:subscription-info-provider",
     "${chip_root}/src/app:test-event-trigger",
+    "${chip_root}/src/app/common:ids",
     "${chip_root}/src/credentials:credentials",
     "${chip_root}/src/lib/address_resolve:address_resolve",
     "${chip_root}/src/messaging",

src/app/util/BUILD.gn

@@ -58,6 +58,7 @@ source_set("af-types") {
   deps = [
     ":types",
     "${chip_root}/src/app:paths",
+    "${chip_root}/src/app/common:cluster-objects",
     "${chip_root}/src/app/data-model",
     "${chip_root}/src/messaging",
     "${chip_root}/src/protocols/interaction_model",

src/credentials/BUILD.gn

@@ -127,6 +127,7 @@ static_library("credentials") {
 
   public_deps = [
     ":build_time_header",
+    "${chip_root}/src/app/util:types",
     "${chip_root}/src/controller:delegates",
     "${chip_root}/src/crypto",
     "${chip_root}/src/lib/asn1",

src/lib/support/tests/BUILD.gn

@@ -87,6 +87,7 @@ chip_test_suite("tests") {
   ]
 
   public_deps = [
+    "${chip_root}/src/app/common:cluster-objects",
     "${chip_root}/src/credentials",
     "${chip_root}/src/lib/core",
     "${chip_root}/src/lib/core:string-builder-adapters",

src/platform/ASR/BUILD.gn

@@ -21,8 +21,7 @@ import("${chip_root}/src/platform/device.gni")
 assert(chip_device_platform == "asr")
 
 static_library("ASR") {
-  sources = []
-  sources += [
+  sources = [
     "../SingletonConfigurationManager.cpp",
     "ASRConfig.cpp",
     "ASRConfig.h",
@@ -72,6 +71,7 @@ static_library("ASR") {
   ]
 
   deps = [
+    "${chip_root}/src/app:app_config",
     "${chip_root}/src/lib/dnssd:platform_header",
     "${chip_root}/src/platform/logging:headers",
     "${chip_root}/src/setup_payload",

src/platform/Ameba/BUILD.gn

@@ -54,6 +54,7 @@ static_library("Ameba") {
   ]
 
   deps = [
+    "${chip_root}/src/app:app_config",
     "${chip_root}/src/lib/dnssd:platform_header",
     "${chip_root}/src/platform/logging:headers",
     "${chip_root}/src/setup_payload",

src/platform/BUILD.gn

@@ -539,7 +539,8 @@ if (chip_device_platform != "none") {
 
     public_deps = [
       ":platform_base",
-      "${chip_root}/src/app/common:cluster-objects",
+      "${chip_root}/src/app/common:ids",
+      "${chip_root}/src/app/util:types",
       "${chip_root}/src/crypto",
       "${chip_root}/src/lib/support",
     ]

src/platform/Beken/BUILD.gn

@@ -32,9 +32,6 @@ static_library("Beken") {
     "ConfigurationManagerImpl.h",
     "ConnectivityManagerImpl.cpp",
     "ConnectivityManagerImpl.h",
-
-    #"DeviceInfoProviderImpl.cpp",
-    #"DeviceInfoProviderImpl.h",
     "DiagnosticDataProviderImpl.cpp",
     "DiagnosticDataProviderImpl.h",
     "KeyValueStoreManagerImpl.cpp",
@@ -50,6 +47,7 @@ static_library("Beken") {
   ]
 
   deps = [
+    "${chip_root}/src/app:app_config",
     "${chip_root}/src/lib/dnssd:platform_header",
     "${chip_root}/src/platform/logging:headers",
     "${chip_root}/src/setup_payload",

src/platform/Darwin/BUILD.gn

@@ -100,6 +100,7 @@ static_library("Darwin") {
   deps = [
     ":logging",
     ":tracing",
+    "${chip_root}/src/app:app_config",
     "${chip_root}/src/lib/dnssd:platform_header",
     "${chip_root}/src/platform/logging:headers",
     "${chip_root}/src/setup_payload",

src/platform/ESP32/BUILD.gn

@@ -65,6 +65,7 @@ static_library("ESP32") {
   ]
 
   deps = [
+    "${chip_root}/src/app:app_config",
     "${chip_root}/src/lib/dnssd:platform_header",
     "${chip_root}/src/platform/logging:headers",
     "${chip_root}/src/setup_payload",
@@ -123,6 +124,13 @@ static_library("ESP32") {
       "NetworkCommissioningDriver.cpp",
       "NetworkCommissioningDriver.h",
     ]
+
+    # TODO: this is NOT ok, however we added a layering dependecy
+    # in NetworkCommissioningDriver accessing app/InteractionModelEngine.h
+    #
+    # Should be removed after https://github.com/project-chip/connectedhomeip/issues/37126
+    # is fixed
+    deps += [ "${chip_root}/src/access:access_config" ]
   }
 
   if (chip_mdns == "platform") {
@@ -166,6 +174,7 @@ static_library("ESP32") {
       "ThreadStackManagerImpl.cpp",
       "ThreadStackManagerImpl.h",
     ]
+    deps += [ "${chip_root}/src/app:app_config" ]
     if (chip_mdns == "platform") {
       sources += [
         "../OpenThread/OpenThreadDnssdImpl.cpp",

src/platform/Infineon/CYW30739/BUILD.gn

@@ -45,6 +45,7 @@ static_library("CYW30739") {
   ]
 
   deps = [
+    "${chip_root}/src/app:app_config",
     "${chip_root}/src/crypto",
     "${matter_wpan_sdk_build_root}:wpan_sdk",
   ]

src/platform/Infineon/PSOC6/BUILD.gn

@@ -67,6 +67,7 @@ static_library("PSOC6") {
   ]
 
   deps = [
+    "${chip_root}/src/app:app_config",
     "${chip_root}/src/lib/dnssd:platform_header",
     "${chip_root}/src/platform/logging:headers",
     "${chip_root}/src/setup_payload",

src/platform/Linux/BUILD.gn

@@ -70,6 +70,7 @@ static_library("Linux") {
   ]
 
   deps = [
+    "${chip_root}/src/app:app_config",
     "${chip_root}/src/app/icd/server:icd-server-config",
     "${chip_root}/src/credentials:credentials_header",
     "${chip_root}/src/setup_payload",
@@ -134,6 +135,7 @@ static_library("Linux") {
       "ThreadStackManagerImpl.h",
     ]
 
+    deps += [ "${chip_root}/src/app:app_config" ]
     public_deps += [ "dbus/openthread" ]
   }
 

src/platform/NuttX/BUILD.gn

@@ -70,6 +70,7 @@ static_library("NuttX") {
   ]
 
   deps = [
+    "${chip_root}/src/app:app_config",
     "${chip_root}/src/app/icd/server:icd-server-config",
     "${chip_root}/src/credentials:credentials_header",
     "${chip_root}/src/setup_payload",
@@ -132,6 +133,7 @@ static_library("NuttX") {
       "ThreadStackManagerImpl.h",
     ]
 
+    deps += [ "${chip_root}/src/app:app_config" ]
     public_deps += [ "dbus/openthread" ]
   }
 

src/platform/Tizen/BUILD.gn

@@ -68,6 +68,7 @@ static_library("Tizen") {
   deps = [ "${chip_root}/src/setup_payload" ]
 
   public_deps = [
+    "${chip_root}/src/app:app_config",
     "${chip_root}/src/platform:platform_base",
     "${chip_root}/src/platform/logging:headers",
     "${tizen_root}:tizen",
@@ -100,6 +101,7 @@ static_library("Tizen") {
       "ThreadStackManagerImpl.cpp",
       "ThreadStackManagerImpl.h",
     ]
+    deps += [ "${chip_root}/src/app:app_config" ]
   }
 
   if (chip_enable_wifi) {

src/platform/Zephyr/BUILD.gn

@@ -53,14 +53,18 @@ static_library("Zephyr") {
   ]
 
   public_deps = [ "${chip_root}/src/platform:platform_base" ]
-  deps = [ "${chip_root}/src/platform/logging:headers" ]
+  deps = [
+    "${chip_root}/src/app:app_config",
+    "${chip_root}/src/platform/logging:headers",
+  ]
 
   if (chip_enable_openthread) {
     sources += [
       "../OpenThread/OpenThreadUtils.cpp",
       "ThreadStackManagerImpl.cpp",
       "ThreadStackManagerImpl.h",
     ]
+    deps += [ "${chip_root}/src/app:app_config" ]
 
     if (chip_mdns == "platform") {
       sources += [

src/platform/android/BUILD.gn

@@ -84,6 +84,7 @@ static_library("android") {
 
   deps = [
     ":tracing",
+    "${chip_root}/src/app:app_config",
     "${chip_root}/src/lib/dnssd:platform_header",
     "${chip_root}/src/setup_payload",
   ]

src/platform/bouffalolab/BL602/BUILD.gn

@@ -70,6 +70,7 @@ static_library("BL602") {
   }
 
   deps = [
+    "${chip_root}/src/app:app_config",
     "${chip_root}/src/credentials:credentials_header",
     "${chip_root}/src/lib/dnssd:platform_header",
     "${chip_root}/src/platform/logging:headers",

src/platform/bouffalolab/BL616/BUILD.gn

@@ -66,6 +66,7 @@ static_library("BL616") {
   }
 
   deps = [
+    "${chip_root}/src/app:app_config",
     "${chip_root}/src/credentials:credentials_header",
     "${chip_root}/src/platform/logging:headers",
   ]
@@ -86,7 +87,10 @@ static_library("BL616") {
 
     import("//build_overrides/bouffalolab_iot_sdk.gni")
     import("${bouffalolab_iot_sdk_build_root}/bl616/bouffalo_sdk.gni")
-    deps += [ "${bouffalolab_iot_sdk_build_root}/bl616:bouffalo_sdk" ]
+    deps += [
+      "${bouffalolab_iot_sdk_build_root}/bl616:bouffalo_sdk",
+      "${chip_root}/src/app:app_config",
+    ]
 
     sources += [
       "../../OpenThread/OpenThreadUtils.cpp",

src/platform/bouffalolab/BL702/BUILD.gn

@@ -92,7 +92,10 @@ static_library("BL702") {
 
     import("//build_overrides/bouffalolab_iot_sdk.gni")
     import("${bouffalolab_iot_sdk_build_root}/bl702/bl_iot_sdk.gni")
-    deps += [ "${bouffalolab_iot_sdk_build_root}/bl702:bl_iot_sdk" ]
+    deps += [
+      "${bouffalolab_iot_sdk_build_root}/bl702:bl_iot_sdk",
+      "${chip_root}/src/app:app_config",
+    ]
 
     sources += [
       "../../OpenThread/OpenThreadUtils.cpp",
@@ -116,7 +119,10 @@ static_library("BL702") {
       "EthernetInterface.c",
     ]
 
-    deps += [ "${chip_root}/src/lib/dnssd:platform_header" ]
+    deps += [
+      "${chip_root}/src/app:app_config",
+      "${chip_root}/src/lib/dnssd:platform_header",
+    ]
   }
 
   public_deps = [ "${chip_root}/src/platform:platform_base" ]

src/platform/bouffalolab/BL702L/BUILD.gn

@@ -70,6 +70,7 @@ static_library("BL702L") {
   }
 
   deps = [
+    "${chip_root}/src/app:app_config",
     "${chip_root}/src/credentials:credentials_header",
     "${chip_root}/src/platform/logging:headers",
   ]
@@ -79,7 +80,10 @@ static_library("BL702L") {
 
     import("//build_overrides/bouffalolab_iot_sdk.gni")
     import("${bouffalolab_iot_sdk_build_root}/bl702l/bl_iot_sdk.gni")
-    deps += [ "${bouffalolab_iot_sdk_build_root}/bl702l:bl_iot_sdk" ]
+    deps += [
+      "${bouffalolab_iot_sdk_build_root}/bl702l:bl_iot_sdk",
+      "${chip_root}/src/app:app_config",
+    ]
 
     sources += [
       "../../OpenThread/OpenThreadUtils.cpp",

src/platform/cc13xx_26xx/cc13x4_26x4/BUILD.gn

@@ -49,7 +49,10 @@ static_library("cc13x4_26x4") {
     "SystemPlatformConfig.h",
   ]
 
-  deps = [ "${chip_root}/src/platform/logging:headers" ]
+  deps = [
+    "${chip_root}/src/app:app_config",
+    "${chip_root}/src/platform/logging:headers",
+  ]
 
   public = [
     "${chip_root}/src/credentials/CHIPCert.h",
@@ -95,6 +98,7 @@ static_library("cc13x4_26x4") {
       "../ThreadStackManagerImpl.cpp",
       "ThreadStackManagerImpl.h",
     ]
+    deps += [ "${chip_root}/src/app:app_config" ]
 
     if (chip_mdns == "platform") {
       deps += [ "${chip_root}/src/lib/dnssd:platform_header" ]

src/platform/cc32xx/BUILD.gn

@@ -43,6 +43,7 @@ static_library("cc32xx") {
   ]
 
   public_deps = [
+    "${chip_root}/src/app:app_config",
     "${chip_root}/src/crypto",
     "${chip_root}/src/platform:platform_base",
   ]