Skip to content

Commit

Permalink
Switch all backends for log and assert to the new chip backends inste…
Browse files Browse the repository at this point in the history
…ad of previous built-in/basic ones. Remove old log backend
  • Loading branch information
andy31415 committed Oct 30, 2024
1 parent 54a1f28 commit b1bfe6d
Show file tree
Hide file tree
Showing 36 changed files with 64 additions and 175 deletions.
4 changes: 2 additions & 2 deletions config/bouffalolab/common/lib/pw_rpc/pw_rpc.gni
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
import("//build_overrides/chip.gni")
import("//build_overrides/pigweed.gni")

pw_log_BACKEND = "$dir_pw_log_basic"
pw_assert_BACKEND = "$dir_pw_assert_log"
pw_log_BACKEND = "${chip_root}/src/backends/log"
pw_assert_BACKEND = "${chip_root}/src/backends/assert"
pw_sys_io_BACKEND =
"${chip_root}/examples/platform/bouffalolab/common/rpc/pw_sys_io:pw_sys_io"

Expand Down
4 changes: 2 additions & 2 deletions config/efr32/lib/pw_rpc/pw_rpc.gni
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
import("//build_overrides/chip.gni")
import("//build_overrides/pigweed.gni")

pw_log_BACKEND = "$dir_pw_log_basic"
pw_assert_BACKEND = "$dir_pw_assert_log:check_backend"
pw_log_BACKEND = "${chip_root}/src/backends/log"
pw_assert_BACKEND = "${chip_root}/src/backends/assert"
pw_rpc_CONFIG = "$dir_pw_rpc:disable_global_mutex"
pw_sys_io_BACKEND =
"${chip_root}/examples/platform/silabs/pw_sys_io:pw_sys_io_silabs"
Expand Down
4 changes: 2 additions & 2 deletions config/mbed/chip-gn/lib/pw_rpc/pw_rpc.gni
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
import("//build_overrides/chip.gni")
import("//build_overrides/pigweed.gni")

pw_log_BACKEND = "$dir_pw_log_basic"
pw_assert_BACKEND = "$dir_pw_assert_log:check_backend"
pw_log_BACKEND = "${chip_root}/src/backends/log"
pw_assert_BACKEND = "${chip_root}/src/backends/assert"
pw_sys_io_BACKEND =
"${chip_root}/examples/platform/mbed/pw_sys_io:pw_sys_io_mbed"
pw_rpc_system_server_BACKEND =
Expand Down
4 changes: 2 additions & 2 deletions config/nxp/lib/pw_rpc/pw_rpc.gni
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
import("//build_overrides/chip.gni")
import("//build_overrides/pigweed.gni")

pw_log_BACKEND = "$dir_pw_log_basic"
pw_assert_BACKEND = "$dir_pw_assert_log:check_backend"
pw_log_BACKEND = "${chip_root}/src/backends/log"
pw_assert_BACKEND = "${chip_root}/src/backends/assert"
pw_rpc_CONFIG = "$dir_pw_rpc:disable_global_mutex"
pw_sys_io_BACKEND = "${chip_root}/examples/platform/nxp/pw_sys_io:pw_sys_io_nxp"

Expand Down
4 changes: 2 additions & 2 deletions config/qpg/lib/pw_rpc/pw_rpc.gni
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
import("//build_overrides/chip.gni")
import("//build_overrides/pigweed.gni")

pw_log_BACKEND = "$dir_pw_log_basic"
pw_assert_BACKEND = "$dir_pw_assert_log:check_backend"
pw_log_BACKEND = "${chip_root}/src/backends/log"
pw_assert_BACKEND = "${chip_root}/src/backends/assert"
pw_sys_io_BACKEND = "${chip_root}/examples/platform/qpg/pw_sys_io:pw_sys_io_qpg"

pw_build_LINK_DEPS = [
Expand Down
4 changes: 2 additions & 2 deletions examples/all-clusters-app/linux/with_pw_rpc.gni
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import("${chip_root}/config/standalone/args.gni")

import("//build_overrides/pigweed.gni")

pw_log_BACKEND = "$dir_pw_log_basic"
pw_assert_BACKEND = "$dir_pw_assert_log:check_backend"
pw_log_BACKEND = "${chip_root}/src/backends/log"
pw_assert_BACKEND = "${chip_root}/src/backends/assert"
pw_sys_io_BACKEND = "$dir_pw_sys_io_stdio"
pw_trace_BACKEND = "$dir_pw_trace_tokenized"
pw_unit_test_MAIN = "$dir_pw_unit_test:logging_main"
Expand Down
4 changes: 2 additions & 2 deletions examples/android/CHIPTest/args.gni
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ chip_monolithic_tests = false

pw_sys_io_BACKEND = "$dir_pw_sys_io_stdio"

pw_assert_BACKEND = "$dir_pw_assert_log"
pw_log_BACKEND = "$dir_pw_log_basic"
pw_assert_BACKEND = "${chip_root}/src/backends/assert"
pw_log_BACKEND = "${chip_root}/src/backends/log"

pw_unit_test_BACKEND = "$dir_pw_unit_test:light"

Expand Down
4 changes: 2 additions & 2 deletions examples/chef/linux/with_pw_rpc.gni
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import("${chip_root}/config/standalone/args.gni")

import("//build_overrides/pigweed.gni")

pw_log_BACKEND = "$dir_pw_log_basic"
pw_assert_BACKEND = "$dir_pw_assert_log:check_backend"
pw_log_BACKEND = "${chip_root}/src/backends/log"
pw_assert_BACKEND = "${chip_root}/src/backends/assert"
pw_sys_io_BACKEND = "$dir_pw_sys_io_stdio"
pw_trace_BACKEND = "$dir_pw_trace_tokenized"
pw_unit_test_MAIN = "$dir_pw_unit_test:logging_main"
Expand Down
4 changes: 2 additions & 2 deletions examples/fabric-admin/with_pw_rpc.gni
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import("${chip_root}/config/standalone/args.gni")

import("//build_overrides/pigweed.gni")

pw_log_BACKEND = "$dir_pw_log_basic"
pw_assert_BACKEND = "$dir_pw_assert_log:check_backend"
pw_log_BACKEND = "${chip_root}/src/backends/log"
pw_assert_BACKEND = "${chip_root}/src/backends/assert"
pw_sys_io_BACKEND = "$dir_pw_sys_io_stdio"
pw_trace_BACKEND = "$dir_pw_trace_tokenized"
pw_unit_test_MAIN = "$dir_pw_unit_test:logging_main"
Expand Down
4 changes: 2 additions & 2 deletions examples/fabric-bridge-app/linux/with_pw_rpc.gni
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import("${chip_root}/config/standalone/args.gni")

import("//build_overrides/pigweed.gni")

pw_log_BACKEND = "$dir_pw_log_basic"
pw_assert_BACKEND = "$dir_pw_assert_log:check_backend"
pw_log_BACKEND = "${chip_root}/src/backends/log"
pw_assert_BACKEND = "${chip_root}/src/backends/assert"
pw_sys_io_BACKEND = "$dir_pw_sys_io_stdio"
pw_trace_BACKEND = "$dir_pw_trace_tokenized"
pw_unit_test_MAIN = "$dir_pw_unit_test:logging_main"
Expand Down
4 changes: 2 additions & 2 deletions examples/light-switch-app/genio/args.gni
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ import("${chip_root}/src/platform/mt793x/args.gni")

mt793x_sdk_target = get_label_info(":sdk", "label_no_toolchain")

pw_log_BACKEND = "${chip_root}/src/lib/support/pw_log_chip"
pw_assert_BACKEND = "$dir_pw_assert_log"
pw_log_BACKEND = "${chip_root}/src/backends/log"
pw_assert_BACKEND = "${chip_root}/src/backends/assert"

chip_enable_ble = true

Expand Down
4 changes: 2 additions & 2 deletions examples/light-switch-app/genio/build_for_wifi_args.gni
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@ mt793x_sdk_target = get_label_info(":sdk", "label_no_toolchain")
chip_enable_openthread = false
import("${chip_root}/src/platform/MT793X/wifi_args.gni")

pw_log_BACKEND = "${chip_root}/src/lib/support/pw_log_chip"
pw_assert_BACKEND = "$dir_pw_assert_log"
pw_log_BACKEND = "${chip_root}/src/backends/log"
pw_assert_BACKEND = "${chip_root}/src/backends/assert"
4 changes: 2 additions & 2 deletions examples/light-switch-app/qpg/args.gni
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,5 @@ chip_stack_lock_tracking = "none"
matter_device_vid = "0xFFF1"
matter_device_pid = "0x8004"

pw_log_BACKEND = "${chip_root}/src/lib/support/pw_log_chip"
pw_assert_BACKEND = "$dir_pw_assert_log:check_backend"
pw_log_BACKEND = "${chip_root}/src/backends/log"
pw_assert_BACKEND = "${chip_root}/src/backends/assert"
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import("${chip_root}/config/standalone/args.gni")

import("//build_overrides/pigweed.gni")

pw_log_BACKEND = "$dir_pw_log_basic"
pw_assert_BACKEND = "$dir_pw_assert_log:check_backend"
pw_log_BACKEND = "${chip_root}/src/backends/log"
pw_assert_BACKEND = "${chip_root}/src/backends/assert"
pw_sys_io_BACKEND = "$dir_pw_sys_io_stdio"
pw_trace_BACKEND = "$dir_pw_trace_tokenized"
pw_unit_test_MAIN = "$dir_pw_unit_test:logging_main"
Expand Down
4 changes: 2 additions & 2 deletions examples/lighting-app/bouffalolab/bl602/args.gni
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ import("${chip_root}/src/platform/bouffalolab/BL602/args.gni")

bl_iot_sdk_target = get_label_info(":sdk", "label_no_toolchain")

pw_log_BACKEND = "${chip_root}/src/lib/support/pw_log_chip"
pw_assert_BACKEND = "$dir_pw_assert_log"
pw_log_BACKEND = "${chip_root}/src/backends/log"
pw_assert_BACKEND = "${chip_root}/src/backends/assert"
pw_rpc_CONFIG = "$dir_pw_rpc:disable_global_mutex"

chip_detail_logging = false
Expand Down
4 changes: 2 additions & 2 deletions examples/lighting-app/bouffalolab/bl702/args.gni
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ import("${chip_root}/src/platform/bouffalolab/BL702/args.gni")

bl_iot_sdk_target = get_label_info(":sdk", "label_no_toolchain")

pw_log_BACKEND = "${chip_root}/src/lib/support/pw_log_chip"
pw_assert_BACKEND = "$dir_pw_assert_log"
pw_log_BACKEND = "${chip_root}/src/backends/log"
pw_assert_BACKEND = "${chip_root}/src/backends/assert"
pw_rpc_CONFIG = "$dir_pw_rpc:disable_global_mutex"

chip_detail_logging = false
Expand Down
4 changes: 2 additions & 2 deletions examples/lighting-app/bouffalolab/bl702l/args.gni
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ import("${chip_root}/src/platform/bouffalolab/BL702L/args.gni")

bl_iot_sdk_target = get_label_info(":sdk", "label_no_toolchain")

pw_log_BACKEND = "${chip_root}/src/lib/support/pw_log_chip"
pw_assert_BACKEND = "$dir_pw_assert_log"
pw_log_BACKEND = "${chip_root}/src/backends/log"
pw_assert_BACKEND = "${chip_root}/src/backends/assert"
pw_rpc_CONFIG = "$dir_pw_rpc:disable_global_mutex"

chip_detail_logging = false
Expand Down
4 changes: 2 additions & 2 deletions examples/lighting-app/genio/args.gni
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ import("${chip_root}/src/platform/mt793x/args.gni")

mt793x_sdk_target = get_label_info(":sdk", "label_no_toolchain")

pw_log_BACKEND = "${chip_root}/src/lib/support/pw_log_chip"
pw_assert_BACKEND = "$dir_pw_assert_log"
pw_log_BACKEND = "${chip_root}/src/backends/log"
pw_assert_BACKEND = "${chip_root}/src/backends/assert"

chip_enable_ble = true

Expand Down
4 changes: 2 additions & 2 deletions examples/lighting-app/genio/build_for_wifi_args.gni
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@ mt793x_sdk_target = get_label_info(":sdk", "label_no_toolchain")
chip_enable_openthread = false
import("${chip_root}/src/platform/MT793X/wifi_args.gni")

pw_log_BACKEND = "${chip_root}/src/lib/support/pw_log_chip"
pw_assert_BACKEND = "$dir_pw_assert_log"
pw_log_BACKEND = "${chip_root}/src/backends/log"
pw_assert_BACKEND = "${chip_root}/src/backends/assert"
4 changes: 2 additions & 2 deletions examples/lighting-app/linux/with_pw_rpc.gni
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import("${chip_root}/config/standalone/args.gni")

import("//build_overrides/pigweed.gni")

pw_log_BACKEND = "$dir_pw_log_basic"
pw_assert_BACKEND = "$dir_pw_assert_log:check_backend"
pw_log_BACKEND = "${chip_root}/src/backends/log"
pw_assert_BACKEND = "${chip_root}/src/backends/assert"
pw_sys_io_BACKEND = "$dir_pw_sys_io_stdio"
pw_trace_BACKEND = "$dir_pw_trace_tokenized"
pw_unit_test_MAIN = "$dir_pw_unit_test:logging_main"
Expand Down
4 changes: 2 additions & 2 deletions examples/lighting-app/qpg/args.gni
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,5 @@ chip_stack_lock_tracking = "none"
matter_device_vid = "0xFFF1"
matter_device_pid = "0x8005"

pw_log_BACKEND = "${chip_root}/src/lib/support/pw_log_chip"
pw_assert_BACKEND = "$dir_pw_assert_log:check_backend"
pw_log_BACKEND = "${chip_root}/src/backends/log"
pw_assert_BACKEND = "${chip_root}/src/backends/assert"
4 changes: 2 additions & 2 deletions examples/lock-app/genio/args.gni
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ import("${chip_root}/src/platform/mt793x/args.gni")

mt793x_sdk_target = get_label_info(":sdk", "label_no_toolchain")

pw_log_BACKEND = "${chip_root}/src/lib/support/pw_log_chip"
pw_assert_BACKEND = "$dir_pw_assert_log"
pw_log_BACKEND = "${chip_root}/src/backends/log"
pw_assert_BACKEND = "${chip_root}/src/backends/assert"

chip_enable_ble = true

Expand Down
4 changes: 2 additions & 2 deletions examples/lock-app/genio/build_for_wifi_args.gni
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@ mt793x_sdk_target = get_label_info(":sdk", "label_no_toolchain")
chip_enable_openthread = false
import("${chip_root}/src/platform/MT793X/wifi_args.gni")

pw_log_BACKEND = "${chip_root}/src/lib/support/pw_log_chip"
pw_assert_BACKEND = "$dir_pw_assert_log"
pw_log_BACKEND = "${chip_root}/src/backends/log"
pw_assert_BACKEND = "${chip_root}/src/backends/assert"
4 changes: 2 additions & 2 deletions examples/lock-app/qpg/args.gni
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,5 @@ chip_stack_lock_tracking = "none"
matter_device_vid = "0xFFF1"
matter_device_pid = "0x8006"

pw_log_BACKEND = "${chip_root}/src/lib/support/pw_log_chip"
pw_assert_BACKEND = "$dir_pw_assert_log:check_backend"
pw_log_BACKEND = "${chip_root}/src/backends/log"
pw_assert_BACKEND = "${chip_root}/src/backends/assert"
4 changes: 2 additions & 2 deletions examples/ota-requestor-app/genio/args.gni
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ import("${chip_root}/src/platform/mt793x/args.gni")

mt793x_sdk_target = get_label_info(":sdk", "label_no_toolchain")

pw_log_BACKEND = "${chip_root}/src/lib/support/pw_log_chip"
pw_assert_BACKEND = "$dir_pw_assert_log"
pw_log_BACKEND = "${chip_root}/src/backends/log"
pw_assert_BACKEND = "${chip_root}/src/backends/assert"

chip_enable_ble = true

Expand Down
4 changes: 2 additions & 2 deletions examples/ota-requestor-app/genio/build_for_wifi_args.gni
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@ mt793x_sdk_target = get_label_info(":sdk", "label_no_toolchain")
chip_enable_openthread = false
import("${chip_root}/src/platform/MT793X/wifi_args.gni")

pw_log_BACKEND = "${chip_root}/src/lib/support/pw_log_chip"
pw_assert_BACKEND = "$dir_pw_assert_log"
pw_log_BACKEND = "${chip_root}/src/backends/log"
pw_assert_BACKEND = "${chip_root}/src/backends/assert"
4 changes: 2 additions & 2 deletions examples/shell/genio/args.gni
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ import("${chip_root}/src/platform/mt793x/args.gni")

mt793x_sdk_target = get_label_info(":sdk", "label_no_toolchain")

pw_log_BACKEND = "${chip_root}/src/lib/support/pw_log_chip"
pw_assert_BACKEND = "$dir_pw_assert_log"
pw_log_BACKEND = "${chip_root}/src/backends/log"
pw_assert_BACKEND = "${chip_root}/src/backends/assert"

chip_enable_ble = false
chip_config_network_layer_ble = false
Expand Down
4 changes: 2 additions & 2 deletions examples/shell/qpg/args.gni
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ import("${chip_root}/examples/platform/qpg/args.gni")

qpg_sdk_target = get_label_info(":sdk", "label_no_toolchain")

pw_log_BACKEND = "${chip_root}/src/lib/support/pw_log_chip"
pw_assert_BACKEND = "$dir_pw_assert_log:check_backend"
pw_log_BACKEND = "${chip_root}/src/backends/log"
pw_assert_BACKEND = "${chip_root}/src/backends/assert"
chip_build_libshell = true

# Disable lock tracking, since our FreeRTOS configuration does not set
Expand Down
4 changes: 2 additions & 2 deletions examples/thermostat/genio/args.gni
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ import("${chip_root}/src/platform/mt793x/args.gni")

mt793x_sdk_target = get_label_info(":sdk", "label_no_toolchain")

pw_log_BACKEND = "${chip_root}/src/lib/support/pw_log_chip"
pw_assert_BACKEND = "$dir_pw_assert_log"
pw_log_BACKEND = "${chip_root}/src/backends/log"
pw_assert_BACKEND = "${chip_root}/src/backends/assert"

chip_enable_ble = true

Expand Down
4 changes: 2 additions & 2 deletions examples/thermostat/genio/build_for_wifi_args.gni
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@ mt793x_sdk_target = get_label_info(":sdk", "label_no_toolchain")
chip_enable_openthread = false
import("${chip_root}/src/platform/MT793X/wifi_args.gni")

pw_log_BACKEND = "${chip_root}/src/lib/support/pw_log_chip"
pw_assert_BACKEND = "$dir_pw_assert_log"
pw_log_BACKEND = "${chip_root}/src/backends/log"
pw_assert_BACKEND = "${chip_root}/src/backends/assert"
4 changes: 2 additions & 2 deletions examples/thermostat/qpg/args.gni
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,5 @@ chip_stack_lock_tracking = "none"
matter_device_vid = "0xFFF1"
matter_device_pid = "0x8003"

pw_log_BACKEND = "${chip_root}/src/lib/support/pw_log_chip"
pw_assert_BACKEND = "$dir_pw_assert_log:check_backend"
pw_log_BACKEND = "${chip_root}/src/backends/log"
pw_assert_BACKEND = "${chip_root}/src/backends/assert"
2 changes: 0 additions & 2 deletions src/app/tests/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -181,8 +181,6 @@ source_set("app-test-stubs") {
"test-interaction-model-api.h",
]

public_configs = [ "${chip_root}/src/lib/support/pw_log_chip:config" ]

public_deps = [
"${chip_root}/src/app/util/mock:mock_codegen_data_model",
"${chip_root}/src/app/util/mock:mock_ember",
Expand Down
35 changes: 0 additions & 35 deletions src/lib/support/pw_log_chip/BUILD.gn

This file was deleted.

Loading

0 comments on commit b1bfe6d

Please sign in to comment.