Skip to content

Commit

Permalink
Work in progress
Browse files Browse the repository at this point in the history
  • Loading branch information
@mbknust
mbknust committed Feb 14, 2024
1 parent 27b8143 commit 7a43751
Show file tree
Hide file tree
Showing 134 changed files with 209 additions and 53 deletions.
8 changes: 6 additions & 2 deletions build/chip/chip_test_suite.gni
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,9 @@ template("chip_test_suite") {

if (current_os != "zephyr" && current_os != "mbed") {
# Depend on stdio logging, and have it take precedence over the default platform backend
public_deps += [ "${chip_root}/src/platform/logging:force_stdio" ]
public_deps += [ "${chip_root}/src/platform/logging:stdio" ]
} else {
public_deps += [ "${chip_root}/src/platform/logging:default" ]
}
}
if (chip_link_tests) {
Expand Down Expand Up @@ -194,7 +196,9 @@ template("chip_test_suite_using_nltest") {

if (current_os != "zephyr" && current_os != "mbed") {
# Depend on stdio logging, and have it take precedence over the default platform backend
public_deps += [ "${chip_root}/src/platform/logging:force_stdio" ]
public_deps += [ "${chip_root}/src/platform/logging:stdio" ]
} else {
public_deps += [ "${chip_root}/src/platform/logging:default" ]
}
}
if (chip_link_tests) {
Expand Down
1 change: 1 addition & 0 deletions examples/air-purifier-app/cc32xx/BUILD.gn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ ti_simplelink_executable("air-purifier_app") {
"${chip_root}/examples/air-purifier-app/air-purifier-common",
"${chip_root}/examples/platform/cc32xx:cc32xx-attestation-credentials",
"${chip_root}/src/lib",
"${chip_root}/src/platform/logging:default",
"${chip_root}/src/setup_payload",
]

Expand Down
1 change: 1 addition & 0 deletions examples/air-purifier-app/linux/BUILD.gn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ executable("chip-air-purifier-app") {
"${chip_root}/examples/air-purifier-app/air-purifier-common",
"${chip_root}/examples/platform/linux:app-main",
"${chip_root}/src/lib",
"${chip_root}/src/platform/logging:default",
]

cflags = [ "-Wconversion" ]
Expand Down
1 change: 1 addition & 0 deletions examples/air-quality-sensor-app/linux/BUILD.gn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ executable("air-quality-sensor-app") {
"${chip_root}/examples/air-quality-sensor-app/air-quality-sensor-common",
"${chip_root}/examples/platform/linux:app-main",
"${chip_root}/src/lib",
"${chip_root}/src/platform/logging:default",
"${chip_root}/third_party/jsoncpp",
]

Expand Down
1 change: 1 addition & 0 deletions examples/all-clusters-app/asr/BUILD.gn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@ asr_executable("clusters_app") {
"${chip_root}/examples/common/QRCode",
"${chip_root}/examples/providers:device_info_provider",
"${chip_root}/src/lib",
"${chip_root}/src/platform/logging:default",
"${chip_root}/src/setup_payload",
]

Expand Down
1 change: 1 addition & 0 deletions examples/all-clusters-app/cc13x2x7_26x2x7/BUILD.gn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ ti_simplelink_executable("all-clusters-app") {
":sysconfig",
"${chip_root}/examples/all-clusters-app/all-clusters-common",
"${chip_root}/src/lib",
"${chip_root}/src/platform/logging:default",
]

if (chip_openthread_ftd) {
Expand Down
1 change: 1 addition & 0 deletions examples/all-clusters-app/cc13x4_26x4/BUILD.gn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@ ti_simplelink_executable("all-clusters-app") {
"${chip_root}/examples/all-clusters-app/all-clusters-common",
"${chip_root}/examples/platform/cc13x4_26x4:cc13x4_26x4-attestation-credentials",
"${chip_root}/src/lib",
"${chip_root}/src/platform/logging:default",
]

if (chip_openthread_ftd) {
Expand Down
1 change: 1 addition & 0 deletions examples/all-clusters-app/infineon/psoc6/BUILD.gn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,7 @@ psoc6_executable("clusters_app") {
"${chip_root}/examples/common/QRCode",
"${chip_root}/examples/providers:device_info_provider",
"${chip_root}/src/lib",
"${chip_root}/src/platform/logging:default",
"${chip_root}/src/setup_payload",
]

Expand Down
2 changes: 2 additions & 0 deletions examples/all-clusters-app/linux/BUILD.gn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,7 @@ if (is_libfuzzer) {
deps = [
":chip-all-clusters-common",
"${chip_root}/examples/platform/linux:app-main",
"${chip_root}/src/platform/logging:default",
]

cflags = [ "-Wconversion" ]
Expand All @@ -140,6 +141,7 @@ if (is_libfuzzer) {
deps = [
":chip-all-clusters-common",
"${chip_root}/examples/platform/linux:app-main",
"${chip_root}/src/platform/logging:default",
]

cflags = [ "-Wconversion" ]
Expand Down
5 changes: 4 additions & 1 deletion examples/all-clusters-app/nxp/mw320/BUILD.gn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,10 @@ mw320_executable("shell_mw320") {
"${chip_root}/src/setup_payload",
]

deps = [ "${chip_root}/src/platform:syscalls_stub" ]
deps = [
"${chip_root}/src/platform:syscalls_stub",
"${chip_root}/src/platform/logging:default",
]

include_dirs = [
"${chip_root}/src/platform/nxp/mw320",
Expand Down
5 changes: 4 additions & 1 deletion examples/all-clusters-app/nxp/rt/rw61x/BUILD.gn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,10 @@ rt_executable("all_cluster_app") {
"../../common/main/main.cpp",
]

deps = [ "${chip_root}/examples/${app_common_folder}" ]
deps = [
"${chip_root}/examples/${app_common_folder}",
"${chip_root}/src/platform/logging:default",
]

if (nxp_device_type == "all-clusters") {
defines += [ "DEVICE_TYPE_ALL_CLUSTERS" ]
Expand Down
1 change: 1 addition & 0 deletions examples/all-clusters-app/tizen/BUILD.gn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ executable("chip-all-clusters-app") {
"${chip_root}/examples/all-clusters-app/all-clusters-common",
"${chip_root}/examples/platform/tizen:app-main",
"${chip_root}/src/lib",
"${chip_root}/src/platform/logging:default",
]

include_dirs = [
Expand Down
1 change: 1 addition & 0 deletions examples/all-clusters-minimal-app/asr/BUILD.gn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ asr_executable("clusters_minimal_app") {
"${chip_root}/examples/common/QRCode",
"${chip_root}/examples/providers:device_info_provider",
"${chip_root}/src/lib",
"${chip_root}/src/platform/logging:default",
"${chip_root}/src/setup_payload",
]

Expand Down
1 change: 1 addition & 0 deletions examples/all-clusters-minimal-app/infineon/psoc6/BUILD.gn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,7 @@ psoc6_executable("clusters_minimal_app") {
"${chip_root}/examples/common/QRCode",
"${chip_root}/examples/providers:device_info_provider",
"${chip_root}/src/lib",
"${chip_root}/src/platform/logging:default",
"${chip_root}/src/setup_payload",
]

Expand Down
1 change: 1 addition & 0 deletions examples/all-clusters-minimal-app/linux/BUILD.gn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ executable("chip-all-clusters-minimal-app") {
":chip-all-clusters-common",
":chip-lock-app-common",
"${chip_root}/examples/platform/linux:app-main",
"${chip_root}/src/platform/logging:default",
]

cflags = [ "-Wconversion" ]
Expand Down
1 change: 1 addition & 0 deletions examples/all-clusters-minimal-app/tizen/BUILD.gn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ executable("chip-all-clusters-minimal-app") {
"${chip_root}/examples/all-clusters-minimal-app/all-clusters-common",
"${chip_root}/examples/platform/tizen:app-main",
"${chip_root}/src/lib",
"${chip_root}/src/platform/logging:default",
]

include_dirs = [
Expand Down
1 change: 1 addition & 0 deletions examples/bridge-app/asr/BUILD.gn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ asr_executable("bridge_app") {
"${chip_root}/examples/common/QRCode",
"${chip_root}/examples/providers:device_info_provider",
"${chip_root}/src/lib",
"${chip_root}/src/platform/logging:default",
"${chip_root}/src/setup_payload",
]

Expand Down
1 change: 1 addition & 0 deletions examples/bridge-app/linux/BUILD.gn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ executable("chip-bridge-app") {
"${chip_root}/examples/bridge-app/bridge-common",
"${chip_root}/examples/platform/linux:app-main",
"${chip_root}/src/lib",
"${chip_root}/src/platform/logging:default",
]

cflags = [ "-Wconversion" ]
Expand Down
1 change: 1 addition & 0 deletions examples/chef/linux/BUILD.gn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ executable("${sample_name}") {
":chef-data-model",
"${chip_root}/examples/platform/linux:app-main",
"${chip_root}/src/lib",
"${chip_root}/src/platform/logging:default",
"${project_dir}/shell_common:shell_common",
]

Expand Down
1 change: 1 addition & 0 deletions examples/chef/silabs/BUILD.gn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ silabs_executable("chef_app") {
deps = [
":chef-common",
":sdk",
"${chip_root}/src/platform/logging:default",
"${examples_plat_dir}:efr32-common",
]

Expand Down
2 changes: 1 addition & 1 deletion examples/chip-tool/BUILD.gn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ executable("chip-tool") {

deps = [
":chip-tool-utils",
"${chip_root}/src/platform/logging:force_stdio",
"${chip_root}/src/platform/logging:stdio",
]

output_dir = root_out_dir
Expand Down
2 changes: 1 addition & 1 deletion examples/common/tracing/BUILD.gn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ executable("chip-trace-decoder") {

output_dir = root_out_dir

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

public_deps = [
"${chip_root}/src/lib",
Expand Down
1 change: 1 addition & 0 deletions examples/contact-sensor-app/linux/BUILD.gn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ executable("contact-sensor-app") {
"${chip_root}/examples/contact-sensor-app/contact-sensor-common",
"${chip_root}/examples/platform/linux:app-main",
"${chip_root}/src/lib",
"${chip_root}/src/platform/logging:default",
]

if (chip_examples_enable_imgui_ui) {
Expand Down
1 change: 1 addition & 0 deletions examples/contact-sensor-app/nxp/k32w/k32w0/BUILD.gn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@ k32w0_executable("contact_sensor_app") {
"${chip_root}/examples/providers:device_info_provider",
"${chip_root}/src/lib",
"${chip_root}/src/platform:syscalls_stub",
"${chip_root}/src/platform/logging:default",
"${chip_root}/third_party/mbedtls:mbedtls",
"${k32w0_platform_dir}/app/support:freertos_mbedtls_utils",
]
Expand Down
1 change: 1 addition & 0 deletions examples/contact-sensor-app/nxp/k32w/k32w1/BUILD.gn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ k32w1_executable("contact_sensor_app") {
"${chip_root}/examples/providers:device_info_provider",
"${chip_root}/src/lib",
"${chip_root}/src/platform:syscalls_stub",
"${chip_root}/src/platform/logging:default",
"${chip_root}/third_party/mbedtls:mbedtls",
"${k32w1_platform_dir}/app/support:freertos_mbedtls_utils",
]
Expand Down
1 change: 1 addition & 0 deletions examples/dishwasher-app/asr/BUILD.gn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ asr_executable("dishwasher_app") {
"${chip_root}/examples/dishwasher-app/dishwasher-common",
"${chip_root}/examples/providers:device_info_provider",
"${chip_root}/src/lib",
"${chip_root}/src/platform/logging:default",
"${chip_root}/src/setup_payload",
]

Expand Down
1 change: 1 addition & 0 deletions examples/dishwasher-app/linux/BUILD.gn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ executable("chip-dishwasher-app") {
"${chip_root}/examples/dishwasher-app/dishwasher-common",
"${chip_root}/examples/platform/linux:app-main",
"${chip_root}/src/lib",
"${chip_root}/src/platform/logging:default",
]

include_dirs = [
Expand Down
1 change: 1 addition & 0 deletions examples/energy-management-app/linux/BUILD.gn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ executable("chip-energy-management-app") {
"${chip_root}/examples/energy-management-app/energy-management-common",
"${chip_root}/examples/platform/linux:app-main",
"${chip_root}/src/lib",
"${chip_root}/src/platform/logging:default",
]

if (chip_examples_enable_imgui_ui) {
Expand Down
1 change: 1 addition & 0 deletions examples/light-switch-app/asr/BUILD.gn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ asr_executable("light_switch_app") {
"${chip_root}/examples/common/QRCode",
"${chip_root}/examples/providers:device_info_provider",
"${chip_root}/src/lib",
"${chip_root}/src/platform/logging:default",
"${chip_root}/src/setup_payload",
]

Expand Down
1 change: 1 addition & 0 deletions examples/light-switch-app/genio/BUILD.gn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ mt793x_executable("light_switch_app") {
"${chip_root}/examples/light-switch-app/light-switch-common",
"${chip_root}/examples/providers:device_info_provider",
"${chip_root}/src/lib",
"${chip_root}/src/platform/logging:default",
"${chip_root}/src/setup_payload",
"${mt793x_examples_plat_dir}:genio-matter-shell",
]
Expand Down
1 change: 1 addition & 0 deletions examples/light-switch-app/infineon/cyw30739/BUILD.gn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ cyw30739_executable("light_switch_app") {
"${chip_root}/examples/providers:device_info_provider",
"${chip_root}/examples/shell/shell_common:shell_common",
"${chip_root}/src/lib",
"${chip_root}/src/platform/logging:default",
]

include_dirs = [ "include" ]
Expand Down
1 change: 1 addition & 0 deletions examples/light-switch-app/qpg/BUILD.gn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ qpg_executable("light_switch_app") {
"${chip_root}/examples/light-switch-app/qpg/zap/",
"${chip_root}/examples/providers:device_info_provider",
"${chip_root}/src/lib",
"${chip_root}/src/platform/logging:default",
"${chip_root}/src/setup_payload",
"${chip_root}/third_party/openthread/platforms:libopenthread-platform",
"${chip_root}/third_party/openthread/platforms:libopenthread-platform-utils",
Expand Down
1 change: 1 addition & 0 deletions examples/light-switch-app/silabs/BUILD.gn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,7 @@ silabs_executable("light_switch_app") {
"${chip_root}/examples/common/pigweed:descriptor_service.nanopb_rpc",
"${chip_root}/examples/common/pigweed:device_service.nanopb_rpc",
"${chip_root}/examples/common/pigweed:lighting_service.nanopb_rpc",
"${chip_root}/src/platform/logging:default",
]

if (wifi_soc) {
Expand Down
1 change: 1 addition & 0 deletions examples/lighting-app/asr/BUILD.gn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ asr_executable("lighting_app") {
"${chip_root}/examples/lighting-app/lighting-common",
"${chip_root}/examples/providers:device_info_provider",
"${chip_root}/src/lib",
"${chip_root}/src/platform/logging:default",
"${chip_root}/src/setup_payload",
]

Expand Down
1 change: 1 addition & 0 deletions examples/lighting-app/bouffalolab/bl602/BUILD.gn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,7 @@ bouffalolab_executable("lighting_app") {
"${chip_root}/examples/common/QRCode",
"${chip_root}/examples/providers:device_info_provider",
"${chip_root}/src/lib",
"${chip_root}/src/platform/logging:default",
"${chip_root}/src/setup_payload",
]

Expand Down
1 change: 1 addition & 0 deletions examples/lighting-app/bouffalolab/bl702/BUILD.gn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,7 @@ bouffalolab_executable("lighting_app") {
":sdk",
"${chip_root}/examples/providers:device_info_provider",
"${chip_root}/src/lib",
"${chip_root}/src/platform/logging:default",
"${chip_root}/src/setup_payload",
]

Expand Down
1 change: 1 addition & 0 deletions examples/lighting-app/bouffalolab/bl702l/BUILD.gn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,7 @@ bouffalolab_executable("lighting_app") {
":sdk",
"${chip_root}/examples/providers:device_info_provider",
"${chip_root}/src/lib",
"${chip_root}/src/platform/logging:default",
"${chip_root}/src/setup_payload",
]

Expand Down
1 change: 1 addition & 0 deletions examples/lighting-app/cc13x2x7_26x2x7/BUILD.gn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ ti_simplelink_executable("lighting_app") {
"${chip_root}/examples/lighting-app/lighting-common",
"${chip_root}/examples/platform/cc13x2_26x2:cc13x2_26x2-attestation-credentials",
"${chip_root}/src/lib",
"${chip_root}/src/platform/logging:default",
]

if (chip_openthread_ftd) {
Expand Down
1 change: 1 addition & 0 deletions examples/lighting-app/cc13x4_26x4/BUILD.gn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ ti_simplelink_executable("lighting_app") {
"${chip_root}/examples/lighting-app/lighting-common",
"${chip_root}/examples/platform/cc13x4_26x4:cc13x4_26x4-attestation-credentials",
"${chip_root}/src/lib",
"${chip_root}/src/platform/logging:default",
]

if (chip_openthread_ftd) {
Expand Down
1 change: 1 addition & 0 deletions examples/lighting-app/genio/BUILD.gn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ mt793x_executable("lighting_app") {
"${chip_root}/examples/lighting-app/lighting-common",
"${chip_root}/examples/providers:device_info_provider",
"${chip_root}/src/lib",
"${chip_root}/src/platform/logging:default",
"${chip_root}/src/setup_payload",
"${mt793x_examples_plat_dir}:genio-matter-shell",
]
Expand Down
1 change: 1 addition & 0 deletions examples/lighting-app/infineon/cyw30739/BUILD.gn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ cyw30739_executable("lighting_app") {
"${chip_root}/examples/providers:device_info_provider",
"${chip_root}/examples/shell/shell_common:shell_common",
"${chip_root}/src/lib",
"${chip_root}/src/platform/logging:default",
]

include_dirs = [ "include" ]
Expand Down
1 change: 1 addition & 0 deletions examples/lighting-app/infineon/psoc6/BUILD.gn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,7 @@ psoc6_executable("lighting_app") {
"${chip_root}/examples/lighting-app/lighting-common",
"${chip_root}/examples/providers:device_info_provider",
"${chip_root}/src/lib",
"${chip_root}/src/platform/logging:default",
"${chip_root}/src/setup_payload",
]

Expand Down
1 change: 1 addition & 0 deletions examples/lighting-app/linux/BUILD.gn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ executable("chip-lighting-app") {
"${chip_root}/examples/lighting-app/lighting-common:lighting-manager",
"${chip_root}/examples/platform/linux:app-main",
"${chip_root}/src/lib",
"${chip_root}/src/platform/logging:default",
"${chip_root}/third_party/jsoncpp",
]

Expand Down
1 change: 1 addition & 0 deletions examples/lighting-app/nxp/k32w/k32w0/BUILD.gn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ k32w0_executable("light_app") {
"${chip_root}/examples/providers:device_info_provider",
"${chip_root}/src/lib",
"${chip_root}/src/platform:syscalls_stub",
"${chip_root}/src/platform/logging:default",
"${chip_root}/third_party/mbedtls:mbedtls",
"${k32w0_platform_dir}/app/support:freertos_mbedtls_utils",
]
Expand Down
1 change: 1 addition & 0 deletions examples/lighting-app/nxp/k32w/k32w1/BUILD.gn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@ k32w1_executable("light_app") {
"${chip_root}/examples/providers:device_info_provider",
"${chip_root}/src/lib",
"${chip_root}/src/platform:syscalls_stub",
"${chip_root}/src/platform/logging:default",
"${chip_root}/third_party/mbedtls:mbedtls",
"${k32w1_platform_dir}/app/support:freertos_mbedtls_utils",
]
Expand Down
1 change: 1 addition & 0 deletions examples/lighting-app/qpg/BUILD.gn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ qpg_executable("lighting_app") {
"${chip_root}/examples/lighting-app/qpg/zap/",
"${chip_root}/examples/providers:device_info_provider",
"${chip_root}/src/lib",
"${chip_root}/src/platform/logging:default",
"${chip_root}/src/setup_payload",
"${chip_root}/third_party/openthread/platforms:libopenthread-platform",
"${chip_root}/third_party/openthread/platforms:libopenthread-platform-utils",
Expand Down
Loading

0 comments on commit 7a43751

Please sign in to comment.