Skip to content

Commit b5cdd21

Browse files
andy31415andy31415
authored
Remove cluster objects dependency from platform (project-chip#37124)
* Remove cluster objects dependency from platform * Add a dependency that was transient before * More updates, get up to qpg to compile * Restyle * Add app_config dependency to all ThreadStackManagerImpl.cpp * Fix one more compile error * Make ConnectivityManagerImpl.cpp depend on app_config * One more dependency for InteractionModelEngine.h * Fix AccessRestrictionProvider dependencies * Workaround for ESP32 layering error
1 parent 46a1a38 commit b5cdd21

File tree

46 files changed

+139
-31
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+139
-31
lines changed

‎examples/common/tracing/BUILD.gn

+2
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ source_set("trace_handlers_decoder") {
9494

9595
deps = [
9696
":trace_handlers",
97+
"${chip_root}/src/app/common:cluster-objects",
9798
"${chip_root}/src/lib",
9899
"${chip_root}/src/lib/core:types",
99100
]
@@ -123,6 +124,7 @@ executable("chip-trace-decoder") {
123124
deps = [ "${chip_root}/src/platform/logging:stdio" ]
124125

125126
public_deps = [
127+
"${chip_root}/src/app/common:cluster-objects",
126128
"${chip_root}/src/lib",
127129
"${chip_root}/src/lib/core:types",
128130
"${chip_root}/third_party/jsoncpp",

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

+1
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@ static_library("ESP32_custom") {
9898
]
9999

100100
deps = [
101+
"${chip_root}/src/app:app_config",
101102
"${chip_root}/src/lib/dnssd:platform_header",
102103
"${chip_root}/src/platform/logging:headers",
103104
"${chip_root}/src/setup_payload",

‎src/access/BUILD.gn

+2
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ source_set("types") {
4343

4444
public_deps = [
4545
":access_config",
46+
"${chip_root}/src/app:app_config",
4647
"${chip_root}/src/lib/core",
4748
"${chip_root}/src/lib/core:types",
4849
]
@@ -76,6 +77,7 @@ static_library("access") {
7677
"AccessRestrictionProvider.cpp",
7778
"AccessRestrictionProvider.h",
7879
]
80+
public_deps += [ "${chip_root}/src/app/common:cluster-objects" ]
7981
}
8082
}
8183

‎src/app/BUILD.gn

+3
Original file line numberDiff line numberDiff line change
@@ -219,6 +219,7 @@ static_library("interaction-model") {
219219
":event-reporter",
220220
":paths",
221221
":subscription-info-provider",
222+
"${chip_root}/src/access",
222223
"${chip_root}/src/app/MessageDef",
223224
"${chip_root}/src/app/data-model-provider",
224225
"${chip_root}/src/app/icd/server:icd-server-config",
@@ -350,6 +351,7 @@ source_set("status-response") {
350351
":constants",
351352
"${chip_root}/src/app/MessageDef",
352353
"${chip_root}/src/messaging",
354+
"${chip_root}/src/protocols/interaction_model",
353355
]
354356
}
355357

@@ -387,6 +389,7 @@ source_set("command-handler-impl") {
387389
":status-response",
388390
"${chip_root}/src/access:types",
389391
"${chip_root}/src/app/MessageDef",
392+
"${chip_root}/src/app/common:cluster-objects",
390393
"${chip_root}/src/app/data-model",
391394
"${chip_root}/src/app/data-model-provider",
392395
"${chip_root}/src/app/util:callbacks",

‎src/app/MessageDef/BUILD.gn

+1
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,7 @@ source_set("MessageDef") {
116116
"${chip_root}/src/app:constants",
117117
"${chip_root}/src/app:events",
118118
"${chip_root}/src/app:paths",
119+
"${chip_root}/src/app/data-model",
119120
"${chip_root}/src/lib/core",
120121
"${chip_root}/src/lib/support",
121122
"${chip_root}/src/protocols/interaction_model",

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

+1
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ source_set("data-model-provider") {
3838
"${chip_root}/src/app:events",
3939
"${chip_root}/src/app:paths",
4040
"${chip_root}/src/app/MessageDef",
41+
"${chip_root}/src/app/common:cluster-objects",
4142
"${chip_root}/src/app/data-model",
4243
"${chip_root}/src/lib/core",
4344
"${chip_root}/src/lib/core:error",

‎src/app/icd/server/BUILD.gn

+1
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@ source_set("manager") {
102102
":observer",
103103
"${chip_root}/src/app:subscription-info-provider",
104104
"${chip_root}/src/app:test-event-trigger",
105+
"${chip_root}/src/app/common:ids",
105106
"${chip_root}/src/credentials:credentials",
106107
"${chip_root}/src/lib/address_resolve:address_resolve",
107108
"${chip_root}/src/messaging",

‎src/app/util/BUILD.gn

+1
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ source_set("af-types") {
5858
deps = [
5959
":types",
6060
"${chip_root}/src/app:paths",
61+
"${chip_root}/src/app/common:cluster-objects",
6162
"${chip_root}/src/app/data-model",
6263
"${chip_root}/src/messaging",
6364
"${chip_root}/src/protocols/interaction_model",

‎src/credentials/BUILD.gn

+1
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,7 @@ static_library("credentials") {
127127

128128
public_deps = [
129129
":build_time_header",
130+
"${chip_root}/src/app/util:types",
130131
"${chip_root}/src/controller:delegates",
131132
"${chip_root}/src/crypto",
132133
"${chip_root}/src/lib/asn1",

‎src/lib/support/tests/BUILD.gn

+1
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@ chip_test_suite("tests") {
8787
]
8888

8989
public_deps = [
90+
"${chip_root}/src/app/common:cluster-objects",
9091
"${chip_root}/src/credentials",
9192
"${chip_root}/src/lib/core",
9293
"${chip_root}/src/lib/core:string-builder-adapters",

‎src/platform/ASR/BUILD.gn

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@ import("${chip_root}/src/platform/device.gni")
2121
assert(chip_device_platform == "asr")
2222

2323
static_library("ASR") {
24-
sources = []
25-
sources += [
24+
sources = [
2625
"../SingletonConfigurationManager.cpp",
2726
"ASRConfig.cpp",
2827
"ASRConfig.h",
@@ -72,6 +71,7 @@ static_library("ASR") {
7271
]
7372

7473
deps = [
74+
"${chip_root}/src/app:app_config",
7575
"${chip_root}/src/lib/dnssd:platform_header",
7676
"${chip_root}/src/platform/logging:headers",
7777
"${chip_root}/src/setup_payload",

‎src/platform/Ameba/BUILD.gn

+1
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ static_library("Ameba") {
5454
]
5555

5656
deps = [
57+
"${chip_root}/src/app:app_config",
5758
"${chip_root}/src/lib/dnssd:platform_header",
5859
"${chip_root}/src/platform/logging:headers",
5960
"${chip_root}/src/setup_payload",

‎src/platform/BUILD.gn

+2-1
Original file line numberDiff line numberDiff line change
@@ -539,7 +539,8 @@ if (chip_device_platform != "none") {
539539

540540
public_deps = [
541541
":platform_base",
542-
"${chip_root}/src/app/common:cluster-objects",
542+
"${chip_root}/src/app/common:ids",
543+
"${chip_root}/src/app/util:types",
543544
"${chip_root}/src/crypto",
544545
"${chip_root}/src/lib/support",
545546
]

‎src/platform/Beken/BUILD.gn

+1-3
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,6 @@ static_library("Beken") {
3232
"ConfigurationManagerImpl.h",
3333
"ConnectivityManagerImpl.cpp",
3434
"ConnectivityManagerImpl.h",
35-
36-
#"DeviceInfoProviderImpl.cpp",
37-
#"DeviceInfoProviderImpl.h",
3835
"DiagnosticDataProviderImpl.cpp",
3936
"DiagnosticDataProviderImpl.h",
4037
"KeyValueStoreManagerImpl.cpp",
@@ -50,6 +47,7 @@ static_library("Beken") {
5047
]
5148

5249
deps = [
50+
"${chip_root}/src/app:app_config",
5351
"${chip_root}/src/lib/dnssd:platform_header",
5452
"${chip_root}/src/platform/logging:headers",
5553
"${chip_root}/src/setup_payload",

‎src/platform/Darwin/BUILD.gn

+1
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@ static_library("Darwin") {
100100
deps = [
101101
":logging",
102102
":tracing",
103+
"${chip_root}/src/app:app_config",
103104
"${chip_root}/src/lib/dnssd:platform_header",
104105
"${chip_root}/src/platform/logging:headers",
105106
"${chip_root}/src/setup_payload",

‎src/platform/ESP32/BUILD.gn

+9
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ static_library("ESP32") {
6565
]
6666

6767
deps = [
68+
"${chip_root}/src/app:app_config",
6869
"${chip_root}/src/lib/dnssd:platform_header",
6970
"${chip_root}/src/platform/logging:headers",
7071
"${chip_root}/src/setup_payload",
@@ -123,6 +124,13 @@ static_library("ESP32") {
123124
"NetworkCommissioningDriver.cpp",
124125
"NetworkCommissioningDriver.h",
125126
]
127+
128+
# TODO: this is NOT ok, however we added a layering dependecy
129+
# in NetworkCommissioningDriver accessing app/InteractionModelEngine.h
130+
#
131+
# Should be removed after https://github.com/project-chip/connectedhomeip/issues/37126
132+
# is fixed
133+
deps += [ "${chip_root}/src/access:access_config" ]
126134
}
127135

128136
if (chip_mdns == "platform") {
@@ -166,6 +174,7 @@ static_library("ESP32") {
166174
"ThreadStackManagerImpl.cpp",
167175
"ThreadStackManagerImpl.h",
168176
]
177+
deps += [ "${chip_root}/src/app:app_config" ]
169178
if (chip_mdns == "platform") {
170179
sources += [
171180
"../OpenThread/OpenThreadDnssdImpl.cpp",

‎src/platform/Infineon/CYW30739/BUILD.gn

+1
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ static_library("CYW30739") {
4545
]
4646

4747
deps = [
48+
"${chip_root}/src/app:app_config",
4849
"${chip_root}/src/crypto",
4950
"${matter_wpan_sdk_build_root}:wpan_sdk",
5051
]

‎src/platform/Infineon/PSOC6/BUILD.gn

+1
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ static_library("PSOC6") {
6767
]
6868

6969
deps = [
70+
"${chip_root}/src/app:app_config",
7071
"${chip_root}/src/lib/dnssd:platform_header",
7172
"${chip_root}/src/platform/logging:headers",
7273
"${chip_root}/src/setup_payload",

‎src/platform/Linux/BUILD.gn

+2
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ static_library("Linux") {
7070
]
7171

7272
deps = [
73+
"${chip_root}/src/app:app_config",
7374
"${chip_root}/src/app/icd/server:icd-server-config",
7475
"${chip_root}/src/credentials:credentials_header",
7576
"${chip_root}/src/setup_payload",
@@ -134,6 +135,7 @@ static_library("Linux") {
134135
"ThreadStackManagerImpl.h",
135136
]
136137

138+
deps += [ "${chip_root}/src/app:app_config" ]
137139
public_deps += [ "dbus/openthread" ]
138140
}
139141

‎src/platform/NuttX/BUILD.gn

+2
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ static_library("NuttX") {
7070
]
7171

7272
deps = [
73+
"${chip_root}/src/app:app_config",
7374
"${chip_root}/src/app/icd/server:icd-server-config",
7475
"${chip_root}/src/credentials:credentials_header",
7576
"${chip_root}/src/setup_payload",
@@ -132,6 +133,7 @@ static_library("NuttX") {
132133
"ThreadStackManagerImpl.h",
133134
]
134135

136+
deps += [ "${chip_root}/src/app:app_config" ]
135137
public_deps += [ "dbus/openthread" ]
136138
}
137139

‎src/platform/Tizen/BUILD.gn

+2
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ static_library("Tizen") {
6868
deps = [ "${chip_root}/src/setup_payload" ]
6969

7070
public_deps = [
71+
"${chip_root}/src/app:app_config",
7172
"${chip_root}/src/platform:platform_base",
7273
"${chip_root}/src/platform/logging:headers",
7374
"${tizen_root}:tizen",
@@ -100,6 +101,7 @@ static_library("Tizen") {
100101
"ThreadStackManagerImpl.cpp",
101102
"ThreadStackManagerImpl.h",
102103
]
104+
deps += [ "${chip_root}/src/app:app_config" ]
103105
}
104106

105107
if (chip_enable_wifi) {

‎src/platform/Zephyr/BUILD.gn

+5-1
Original file line numberDiff line numberDiff line change
@@ -53,14 +53,18 @@ static_library("Zephyr") {
5353
]
5454

5555
public_deps = [ "${chip_root}/src/platform:platform_base" ]
56-
deps = [ "${chip_root}/src/platform/logging:headers" ]
56+
deps = [
57+
"${chip_root}/src/app:app_config",
58+
"${chip_root}/src/platform/logging:headers",
59+
]
5760

5861
if (chip_enable_openthread) {
5962
sources += [
6063
"../OpenThread/OpenThreadUtils.cpp",
6164
"ThreadStackManagerImpl.cpp",
6265
"ThreadStackManagerImpl.h",
6366
]
67+
deps += [ "${chip_root}/src/app:app_config" ]
6468

6569
if (chip_mdns == "platform") {
6670
sources += [

‎src/platform/android/BUILD.gn

+1
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ static_library("android") {
8484

8585
deps = [
8686
":tracing",
87+
"${chip_root}/src/app:app_config",
8788
"${chip_root}/src/lib/dnssd:platform_header",
8889
"${chip_root}/src/setup_payload",
8990
]

‎src/platform/bouffalolab/BL602/BUILD.gn

+1
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ static_library("BL602") {
7070
}
7171

7272
deps = [
73+
"${chip_root}/src/app:app_config",
7374
"${chip_root}/src/credentials:credentials_header",
7475
"${chip_root}/src/lib/dnssd:platform_header",
7576
"${chip_root}/src/platform/logging:headers",

‎src/platform/bouffalolab/BL616/BUILD.gn

+5-1
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ static_library("BL616") {
6666
}
6767

6868
deps = [
69+
"${chip_root}/src/app:app_config",
6970
"${chip_root}/src/credentials:credentials_header",
7071
"${chip_root}/src/platform/logging:headers",
7172
]
@@ -86,7 +87,10 @@ static_library("BL616") {
8687

8788
import("//build_overrides/bouffalolab_iot_sdk.gni")
8889
import("${bouffalolab_iot_sdk_build_root}/bl616/bouffalo_sdk.gni")
89-
deps += [ "${bouffalolab_iot_sdk_build_root}/bl616:bouffalo_sdk" ]
90+
deps += [
91+
"${bouffalolab_iot_sdk_build_root}/bl616:bouffalo_sdk",
92+
"${chip_root}/src/app:app_config",
93+
]
9094

9195
sources += [
9296
"../../OpenThread/OpenThreadUtils.cpp",

‎src/platform/bouffalolab/BL702/BUILD.gn

+8-2
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,10 @@ static_library("BL702") {
9292

9393
import("//build_overrides/bouffalolab_iot_sdk.gni")
9494
import("${bouffalolab_iot_sdk_build_root}/bl702/bl_iot_sdk.gni")
95-
deps += [ "${bouffalolab_iot_sdk_build_root}/bl702:bl_iot_sdk" ]
95+
deps += [
96+
"${bouffalolab_iot_sdk_build_root}/bl702:bl_iot_sdk",
97+
"${chip_root}/src/app:app_config",
98+
]
9699

97100
sources += [
98101
"../../OpenThread/OpenThreadUtils.cpp",
@@ -116,7 +119,10 @@ static_library("BL702") {
116119
"EthernetInterface.c",
117120
]
118121

119-
deps += [ "${chip_root}/src/lib/dnssd:platform_header" ]
122+
deps += [
123+
"${chip_root}/src/app:app_config",
124+
"${chip_root}/src/lib/dnssd:platform_header",
125+
]
120126
}
121127

122128
public_deps = [ "${chip_root}/src/platform:platform_base" ]

‎src/platform/bouffalolab/BL702L/BUILD.gn

+5-1
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ static_library("BL702L") {
7070
}
7171

7272
deps = [
73+
"${chip_root}/src/app:app_config",
7374
"${chip_root}/src/credentials:credentials_header",
7475
"${chip_root}/src/platform/logging:headers",
7576
]
@@ -79,7 +80,10 @@ static_library("BL702L") {
7980

8081
import("//build_overrides/bouffalolab_iot_sdk.gni")
8182
import("${bouffalolab_iot_sdk_build_root}/bl702l/bl_iot_sdk.gni")
82-
deps += [ "${bouffalolab_iot_sdk_build_root}/bl702l:bl_iot_sdk" ]
83+
deps += [
84+
"${bouffalolab_iot_sdk_build_root}/bl702l:bl_iot_sdk",
85+
"${chip_root}/src/app:app_config",
86+
]
8387

8488
sources += [
8589
"../../OpenThread/OpenThreadUtils.cpp",

‎src/platform/cc13xx_26xx/cc13x4_26x4/BUILD.gn

+5-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,10 @@ static_library("cc13x4_26x4") {
4949
"SystemPlatformConfig.h",
5050
]
5151

52-
deps = [ "${chip_root}/src/platform/logging:headers" ]
52+
deps = [
53+
"${chip_root}/src/app:app_config",
54+
"${chip_root}/src/platform/logging:headers",
55+
]
5356

5457
public = [
5558
"${chip_root}/src/credentials/CHIPCert.h",
@@ -95,6 +98,7 @@ static_library("cc13x4_26x4") {
9598
"../ThreadStackManagerImpl.cpp",
9699
"ThreadStackManagerImpl.h",
97100
]
101+
deps += [ "${chip_root}/src/app:app_config" ]
98102

99103
if (chip_mdns == "platform") {
100104
deps += [ "${chip_root}/src/lib/dnssd:platform_header" ]

‎src/platform/cc32xx/BUILD.gn

+1
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ static_library("cc32xx") {
4343
]
4444

4545
public_deps = [
46+
"${chip_root}/src/app:app_config",
4647
"${chip_root}/src/crypto",
4748
"${chip_root}/src/platform:platform_base",
4849
]

0 commit comments

Comments
 (0)