Skip to content

Commit ee40086

Browse files
Restore ability to select logging backend on Linux (#39800)
* Revert "use stdio log instead of default since it has colours (#37765)" This change broke the ability to actually select a logging backend on Linux via the chip_logging_backend configuration variable. This reverts commit 262d0fc. * Use stdio logging backend on Linux as per review discussion
1 parent 92bfc3f commit ee40086

File tree

4 files changed

+2
-71
lines changed

4 files changed

+2
-71
lines changed

examples/platform/linux/BUILD.gn

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ source_set("app-main") {
132132
":wifi-diagnostics-test-event-trigger",
133133
"${chip_root}/src/data-model-providers/codegen:instance-header",
134134
"${chip_root}/src/lib",
135-
"${chip_root}/src/platform/logging:stdio",
135+
"${chip_root}/src/platform/logging:default",
136136
]
137137
deps = [
138138
":ota-test-event-trigger",

src/platform/Linux/BUILD.gn

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -181,12 +181,3 @@ static_library("Linux") {
181181
public_deps += [ "${chip_root}/src/wifipaf" ]
182182
}
183183
}
184-
185-
source_set("logging") {
186-
deps = [
187-
"${chip_root}/src/platform:platform_base",
188-
"${chip_root}/src/platform/logging:headers",
189-
]
190-
191-
sources = [ "Logging.cpp" ]
192-
}

src/platform/Linux/Logging.cpp

Lines changed: 0 additions & 60 deletions
This file was deleted.

src/platform/logging/BUILD.gn

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ group("default") {
5454
} else if (chip_device_platform == "SiWx917") {
5555
deps += [ "${chip_root}/src/platform/silabs/SiWx917:logging" ]
5656
} else if (chip_device_platform == "linux") {
57-
deps += [ "${chip_root}/src/platform/Linux:logging" ]
57+
deps += [ ":stdio" ]
5858
} else if (chip_device_platform == "tizen") {
5959
deps += [ "${chip_root}/src/platform/Tizen:logging" ]
6060
} else if (chip_device_platform == "qpg") {

0 commit comments

Comments
 (0)