Skip to content

Commit 686e73b

Browse files
mbknustmbknust
authored
Choose logging backend on a per-target basis (#32119)
Executables and shared libraries now explicitly link with `platform/logging:default` or `platform/logging:stdio`, so that the `platform/logging:force_stdio` kludge is no longer needed. The `chip_monolithic_tests` gn arg has been moved to `build/chip/tests.gni`.
1 parent 66e0663 commit 686e73b

File tree

125 files changed

+479
-131
lines changed

Some content is hidden

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

125 files changed

+479
-131
lines changed

‎build/chip/chip_test_suite.gni

+5-2
Original file line numberDiff line numberDiff line change
@@ -94,9 +94,12 @@ template("chip_test_suite") {
9494

9595
deps = [ dir_pw_unit_test ]
9696

97-
if (current_os != "zephyr" && current_os != "mbed") {
97+
if (current_os != "zephyr" && current_os != "mbed" &&
98+
chip_device_platform != "efr32") {
9899
# Depend on stdio logging, and have it take precedence over the default platform backend
99-
public_deps += [ "${chip_root}/src/platform/logging:force_stdio" ]
100+
public_deps += [ "${chip_root}/src/platform/logging:stdio" ]
101+
} else {
102+
public_deps += [ "${chip_root}/src/platform/logging:default" ]
100103
}
101104
}
102105
if (chip_link_tests) {

‎build/chip/tests.gni

+5
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,11 @@ import("//build_overrides/chip.gni")
1818
import("${chip_root}/build/chip/tools.gni")
1919
import("${chip_root}/src/platform/device.gni")
2020

21+
declare_args() {
22+
# Build monolithic test library.
23+
chip_monolithic_tests = false
24+
}
25+
2126
declare_args() {
2227
# Enable building tests.
2328
chip_build_tests = current_os != "freertos"

‎config/common/cmake/chip_gn.cmake

+6-1
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ macro(matter_build target)
7777
LIB_PW_RPC
7878
LIB_MBEDTLS
7979
DEVICE_INFO_EXAMPLE_PROVIDER
80+
FORCE_LOGGING_STDIO
8081
)
8182
set(multiValueArgs GN_DEPENDENCIES)
8283

@@ -85,7 +86,11 @@ macro(matter_build target)
8586
set(MATTER_LIB_DIR ${CMAKE_CURRENT_BINARY_DIR}/lib)
8687

8788
# Prepare Matter libraries that the application should be linked with
88-
set(MATTER_LIBRARIES -lCHIP)
89+
if (FORCE_LOGGING_STDIO)
90+
set(MATTER_LIBRARIES -lCHIPWithStdioLogging)
91+
else()
92+
set(MATTER_LIBRARIES -lCHIP)
93+
endif()
8994

9095
if (ARG_LIB_MBEDTLS)
9196
list(APPEND MATTER_LIBRARIES -lmbedtls)

‎config/openiotsdk/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ matter_build(chip
7979
LIB_SHELL ${CONFIG_CHIP_LIB_SHELL}
8080
LIB_TESTS ${CONFIG_CHIP_LIB_TESTS}
8181
GN_DEPENDENCIES ${CONFIG_GN_DEPENDENCIES}
82+
FORCE_LOGGING_STDIO ${CONFIG_CHIP_FORCE_LOGGING_STDIO}
8283
)
8384

8485
target_link_libraries(chip INTERFACE

‎config/openiotsdk/cmake/chip.cmake

+1
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ set(CONFIG_CHIP_PROJECT_CONFIG_INCLUDE_DIRS "" CACHE STRING "")
2727
set(CONFIG_CHIP_LIB_TESTS NO CACHE BOOL "")
2828
set(CONFIG_CHIP_LIB_SHELL NO CACHE BOOL "")
2929

30+
set(CONFIG_CHIP_FORCE_LOGGING_STDIO NO CACHE BOOL "Enable stdio logging backend")
3031
set(CONFIG_CHIP_DETAIL_LOGGING YES CACHE BOOL "Enable logging at detail level")
3132
set(CONFIG_CHIP_PROGRESS_LOGGING YES CACHE BOOL "Enable logging at progress level")
3233
set(CONFIG_CHIP_AUTOMATION_LOGGING YES CACHE BOOL "Enable logging at automation level")

‎examples/air-purifier-app/cc32xx/BUILD.gn

+1
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@ ti_simplelink_executable("air-purifier_app") {
100100
"${chip_root}/examples/air-purifier-app/air-purifier-common",
101101
"${chip_root}/examples/platform/cc32xx:cc32xx-attestation-credentials",
102102
"${chip_root}/src/lib",
103+
"${chip_root}/src/platform/logging:default",
103104
"${chip_root}/src/setup_payload",
104105
]
105106

‎examples/all-clusters-app/asr/BUILD.gn

+1
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,7 @@ asr_executable("clusters_app") {
108108
"${chip_root}/examples/common/QRCode",
109109
"${chip_root}/examples/providers:device_info_provider",
110110
"${chip_root}/src/lib",
111+
"${chip_root}/src/platform/logging:default",
111112
"${chip_root}/src/setup_payload",
112113
]
113114

‎examples/all-clusters-app/cc13x4_26x4/BUILD.gn

+1
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ ti_simplelink_executable("all-clusters-app") {
9191
"${chip_root}/examples/all-clusters-app/all-clusters-common",
9292
"${chip_root}/examples/platform/cc13x4_26x4:cc13x4_26x4-attestation-credentials",
9393
"${chip_root}/src/lib",
94+
"${chip_root}/src/platform/logging:default",
9495
"${chip_root}/third_party/openthread:openthread",
9596
]
9697
defines = []

‎examples/all-clusters-app/infineon/psoc6/BUILD.gn

+1
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,7 @@ psoc6_executable("clusters_app") {
138138
"${chip_root}/examples/common/QRCode",
139139
"${chip_root}/examples/providers:device_info_provider",
140140
"${chip_root}/src/lib",
141+
"${chip_root}/src/platform/logging:default",
141142
"${chip_root}/src/setup_payload",
142143
]
143144

‎examples/all-clusters-app/nxp/mw320/BUILD.gn

+4-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,10 @@ mw320_executable("shell_mw320") {
6363
"${chip_root}/src/setup_payload",
6464
]
6565

66-
deps = [ "${chip_root}/src/platform:syscalls_stub" ]
66+
deps = [
67+
"${chip_root}/src/platform:syscalls_stub",
68+
"${chip_root}/src/platform/logging:default",
69+
]
6770

6871
include_dirs = [
6972
"${chip_root}/src/platform/nxp/mw320",

‎examples/all-clusters-app/nxp/rt/rw61x/BUILD.gn

+4-1
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,10 @@ rt_executable("all_cluster_app") {
170170
"${common_example_dir}/matter_button/source/AppMatterButtonEmpty.cpp",
171171
]
172172

173-
deps = [ "${chip_root}/examples/${app_common_folder}" ]
173+
deps = [
174+
"${chip_root}/examples/${app_common_folder}",
175+
"${chip_root}/src/platform/logging:default",
176+
]
174177

175178
sources += [
176179
"${chip_root}/examples/all-clusters-app/all-clusters-common/src/bridged-actions-stub.cpp",

‎examples/all-clusters-minimal-app/asr/BUILD.gn

+1
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ asr_executable("clusters_minimal_app") {
9494
"${chip_root}/examples/common/QRCode",
9595
"${chip_root}/examples/providers:device_info_provider",
9696
"${chip_root}/src/lib",
97+
"${chip_root}/src/platform/logging:default",
9798
"${chip_root}/src/setup_payload",
9899
]
99100

‎examples/all-clusters-minimal-app/infineon/psoc6/BUILD.gn

+1
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,7 @@ psoc6_executable("clusters_minimal_app") {
126126
"${chip_root}/examples/common/QRCode",
127127
"${chip_root}/examples/providers:device_info_provider",
128128
"${chip_root}/src/lib",
129+
"${chip_root}/src/platform/logging:default",
129130
"${chip_root}/src/setup_payload",
130131
]
131132

‎examples/bridge-app/asr/BUILD.gn

+1
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@ asr_executable("bridge_app") {
9595
"${chip_root}/examples/common/QRCode",
9696
"${chip_root}/examples/providers:device_info_provider",
9797
"${chip_root}/src/lib",
98+
"${chip_root}/src/platform/logging:default",
9899
"${chip_root}/src/setup_payload",
99100
]
100101

‎examples/chef/silabs/BUILD.gn

+1
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ silabs_executable("chef_app") {
9494
deps = [
9595
":chef-common",
9696
":sdk",
97+
"${chip_root}/src/platform/logging:default",
9798
"${examples_plat_dir}:efr32-common",
9899
]
99100

‎examples/chip-tool/BUILD.gn

+1-1
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ executable("chip-tool") {
132132

133133
deps = [
134134
":chip-tool-utils",
135-
"${chip_root}/src/platform/logging:force_stdio",
135+
"${chip_root}/src/platform/logging:stdio",
136136
]
137137

138138
output_dir = root_out_dir

‎examples/common/tracing/BUILD.gn

+1-1
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ executable("chip-trace-decoder") {
120120

121121
output_dir = root_out_dir
122122

123-
deps = [ "${chip_root}/src/platform/logging:force_stdio" ]
123+
deps = [ "${chip_root}/src/platform/logging:stdio" ]
124124

125125
public_deps = [
126126
"${chip_root}/src/lib",

‎examples/contact-sensor-app/nxp/k32w/k32w0/BUILD.gn

+1
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,7 @@ k32w0_executable("contact_sensor_app") {
114114
"${chip_root}/examples/providers:device_info_provider",
115115
"${chip_root}/src/lib",
116116
"${chip_root}/src/platform:syscalls_stub",
117+
"${chip_root}/src/platform/logging:default",
117118
"${chip_root}/third_party/mbedtls:mbedtls",
118119
"${k32w0_platform_dir}/app/support:freertos_mbedtls_utils",
119120
]

‎examples/contact-sensor-app/nxp/k32w/k32w1/BUILD.gn

+1
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,7 @@ k32w1_executable("contact_sensor_app") {
110110
"${chip_root}/examples/providers:device_info_provider",
111111
"${chip_root}/src/lib",
112112
"${chip_root}/src/platform:syscalls_stub",
113+
"${chip_root}/src/platform/logging:default",
113114
"${chip_root}/third_party/mbedtls:mbedtls",
114115
"${k32w1_platform_dir}/app/support:freertos_mbedtls_utils",
115116
]

‎examples/dishwasher-app/asr/BUILD.gn

+1
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@ asr_executable("dishwasher_app") {
9292
"${chip_root}/examples/dishwasher-app/dishwasher-common",
9393
"${chip_root}/examples/providers:device_info_provider",
9494
"${chip_root}/src/lib",
95+
"${chip_root}/src/platform/logging:default",
9596
"${chip_root}/src/setup_payload",
9697
]
9798

‎examples/fabric-admin/BUILD.gn

+1-1
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ executable("fabric-admin") {
157157

158158
deps = [
159159
":fabric-admin-utils",
160-
"${chip_root}/src/platform/logging:force_stdio",
160+
"${chip_root}/src/platform/logging:stdio",
161161
]
162162

163163
output_dir = root_out_dir

‎examples/laundry-washer-app/nxp/rt/rw61x/BUILD.gn

+4-1
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,10 @@ rt_executable("laundry-washer") {
171171
"${common_example_dir}/matter_button/source/AppMatterButtonEmpty.cpp",
172172
]
173173

174-
deps = [ "${chip_root}/examples/${app_common_folder}" ]
174+
deps = [
175+
"${chip_root}/examples/${app_common_folder}",
176+
"${chip_root}/src/platform/logging:default",
177+
]
175178

176179
sources += [
177180
"${chip_root}/examples/all-clusters-app/all-clusters-common/src/bridged-actions-stub.cpp",

‎examples/light-switch-app/asr/BUILD.gn

+1
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ asr_executable("light_switch_app") {
7575
"${chip_root}/examples/common/QRCode",
7676
"${chip_root}/examples/providers:device_info_provider",
7777
"${chip_root}/src/lib",
78+
"${chip_root}/src/platform/logging:default",
7879
"${chip_root}/src/setup_payload",
7980
]
8081

‎examples/light-switch-app/genio/BUILD.gn

+1
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ mt793x_executable("light_switch_app") {
8383
"${chip_root}/examples/light-switch-app/light-switch-common",
8484
"${chip_root}/examples/providers:device_info_provider",
8585
"${chip_root}/src/lib",
86+
"${chip_root}/src/platform/logging:default",
8687
"${chip_root}/src/setup_payload",
8788
"${mt793x_examples_plat_dir}:genio-matter-shell",
8889
]

‎examples/light-switch-app/infineon/cyw30739/BUILD.gn

+1
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ template("matter_wpan_app") {
4545

4646
deps = [
4747
"${chip_root}/examples/shell/shell_common:shell_common",
48+
"${chip_root}/src/platform/logging:default",
4849
app_data_model,
4950
]
5051

‎examples/light-switch-app/qpg/BUILD.gn

+1
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ qpg_executable("light_switch_app") {
6565
"${chip_root}/examples/light-switch-app/qpg/zap/",
6666
"${chip_root}/examples/providers:device_info_provider",
6767
"${chip_root}/src/lib",
68+
"${chip_root}/src/platform/logging:default",
6869
"${chip_root}/src/setup_payload",
6970
"${chip_root}/third_party/openthread/platforms:libopenthread-platform",
7071
"${chip_root}/third_party/openthread/platforms:libopenthread-platform-utils",

‎examples/light-switch-app/silabs/BUILD.gn

+1
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,7 @@ silabs_executable("light_switch_app") {
166166
"${chip_root}/examples/common/pigweed:descriptor_service.nanopb_rpc",
167167
"${chip_root}/examples/common/pigweed:device_service.nanopb_rpc",
168168
"${chip_root}/examples/common/pigweed:lighting_service.nanopb_rpc",
169+
"${chip_root}/src/platform/logging:default",
169170
]
170171

171172
if (wifi_soc) {

‎examples/lighting-app/asr/BUILD.gn

+1
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@ asr_executable("lighting_app") {
9292
"${chip_root}/examples/lighting-app/lighting-common",
9393
"${chip_root}/examples/providers:device_info_provider",
9494
"${chip_root}/src/lib",
95+
"${chip_root}/src/platform/logging:default",
9596
"${chip_root}/src/setup_payload",
9697
]
9798

‎examples/lighting-app/bouffalolab/bl602/BUILD.gn

+1
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,7 @@ bouffalolab_executable("lighting_app") {
146146
"${chip_root}/examples/common/QRCode",
147147
"${chip_root}/examples/providers:device_info_provider",
148148
"${chip_root}/src/lib",
149+
"${chip_root}/src/platform/logging:default",
149150
"${chip_root}/src/setup_payload",
150151
]
151152

‎examples/lighting-app/bouffalolab/bl702/BUILD.gn

+1
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,7 @@ bouffalolab_executable("lighting_app") {
173173
":sdk",
174174
"${chip_root}/examples/providers:device_info_provider",
175175
"${chip_root}/src/lib",
176+
"${chip_root}/src/platform/logging:default",
176177
"${chip_root}/src/setup_payload",
177178
]
178179

‎examples/lighting-app/bouffalolab/bl702l/BUILD.gn

+1
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,7 @@ bouffalolab_executable("lighting_app") {
148148
":sdk",
149149
"${chip_root}/examples/providers:device_info_provider",
150150
"${chip_root}/src/lib",
151+
"${chip_root}/src/platform/logging:default",
151152
"${chip_root}/src/setup_payload",
152153
]
153154

‎examples/lighting-app/cc13x4_26x4/BUILD.gn

+1
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ ti_simplelink_executable("lighting_app") {
7777
"${chip_root}/examples/lighting-app/lighting-common",
7878
"${chip_root}/examples/platform/cc13x4_26x4:cc13x4_26x4-attestation-credentials",
7979
"${chip_root}/src/lib",
80+
"${chip_root}/src/platform/logging:default",
8081
"${chip_root}/third_party/openthread:openthread",
8182
]
8283
defines = []

‎examples/lighting-app/genio/BUILD.gn

+1
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ mt793x_executable("lighting_app") {
8484
"${chip_root}/examples/lighting-app/lighting-common",
8585
"${chip_root}/examples/providers:device_info_provider",
8686
"${chip_root}/src/lib",
87+
"${chip_root}/src/platform/logging:default",
8788
"${chip_root}/src/setup_payload",
8889
"${mt793x_examples_plat_dir}:genio-matter-shell",
8990
]

‎examples/lighting-app/infineon/cyw30739/BUILD.gn

+1
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ template("matter_wpan_app") {
4343

4444
deps = [
4545
"${chip_root}/examples/shell/shell_common:shell_common",
46+
"${chip_root}/src/platform/logging:default",
4647
app_data_model,
4748
]
4849

‎examples/lighting-app/infineon/psoc6/BUILD.gn

+1
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,7 @@ psoc6_executable("lighting_app") {
122122
"${chip_root}/examples/lighting-app/lighting-common",
123123
"${chip_root}/examples/providers:device_info_provider",
124124
"${chip_root}/src/lib",
125+
"${chip_root}/src/platform/logging:default",
125126
"${chip_root}/src/setup_payload",
126127
]
127128

‎examples/lighting-app/nxp/k32w/k32w0/BUILD.gn

+1
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,7 @@ k32w0_executable("light_app") {
115115
"${chip_root}/src/app:test-event-trigger",
116116
"${chip_root}/src/lib",
117117
"${chip_root}/src/platform:syscalls_stub",
118+
"${chip_root}/src/platform/logging:default",
118119
"${chip_root}/third_party/mbedtls:mbedtls",
119120
"${k32w0_platform_dir}/app/support:freertos_mbedtls_utils",
120121
]

‎examples/lighting-app/nxp/k32w/k32w1/BUILD.gn

+1
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,7 @@ k32w1_executable("light_app") {
141141
"${chip_root}/examples/providers:device_info_provider",
142142
"${chip_root}/src/lib",
143143
"${chip_root}/src/platform:syscalls_stub",
144+
"${chip_root}/src/platform/logging:default",
144145
"${chip_root}/third_party/mbedtls:mbedtls",
145146
"${k32w1_platform_dir}/app/support:freertos_mbedtls_utils",
146147
]

‎examples/lighting-app/qpg/BUILD.gn

+1
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ qpg_executable("lighting_app") {
6767
"${chip_root}/examples/lighting-app/qpg/zap/",
6868
"${chip_root}/examples/providers:device_info_provider",
6969
"${chip_root}/src/lib",
70+
"${chip_root}/src/platform/logging:default",
7071
"${chip_root}/src/setup_payload",
7172
"${chip_root}/third_party/openthread/platforms:libopenthread-platform",
7273
"${chip_root}/third_party/openthread/platforms:libopenthread-platform-utils",

‎examples/lighting-app/silabs/BUILD.gn

+1
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,7 @@ silabs_executable("lighting_app") {
143143

144144
deps = [
145145
":sdk",
146+
"${chip_root}/src/platform/logging:default",
146147
app_data_model,
147148
]
148149

‎examples/lighting-app/stm32/BUILD.gn

+4
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,8 @@ stm32_sdk("sdk") {
8484
}
8585

8686
stm32_executable("lighting_app") {
87+
deps = []
88+
8789
if (stm32_board == "STM32WB5MM-DK") {
8890
output_name = "chip-stm32-lighting-example.elf"
8991
include_dirs = [
@@ -118,6 +120,8 @@ stm32_executable("lighting_app") {
118120
]
119121
}
120122

123+
deps += [ "${chip_root}/src/platform/logging:default" ]
124+
121125
# Add the startup file to the target
122126
sources += [ "${examples_plat_dir}/startup_files/startup_${stm32_mcu}.s" ]
123127

‎examples/lit-icd-app/silabs/BUILD.gn

+1
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,7 @@ silabs_executable("lit_icd_app") {
125125

126126
deps = [
127127
":sdk",
128+
"${chip_root}/src/platform/logging:default",
128129
app_data_model,
129130
]
130131

‎examples/lock-app/asr/BUILD.gn

+1
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ asr_executable("lock_app") {
7676
"${chip_root}/examples/lock-app/lock-common",
7777
"${chip_root}/examples/providers:device_info_provider",
7878
"${chip_root}/src/lib",
79+
"${chip_root}/src/platform/logging:default",
7980
"${chip_root}/src/setup_payload",
8081
]
8182

‎examples/lock-app/cc13x4_26x4/BUILD.gn

+1
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ ti_simplelink_executable("lock_app") {
8585
"${chip_root}/examples/lock-app/lock-common",
8686
"${chip_root}/examples/platform/cc13x4_26x4:cc13x4_26x4-attestation-credentials",
8787
"${chip_root}/src/lib",
88+
"${chip_root}/src/platform/logging:default",
8889
"${chip_root}/third_party/openthread:openthread",
8990
]
9091
defines = []

0 commit comments

Comments
 (0)