Switch all backends for log and assert to the new chip backends inste…

…ad of previous built-in/basic ones. Remove old log backend
project-chip · Oct 30, 2024 · b1bfe6d · b1bfe6d
1 parent 54a1f28
commit b1bfe6d
Show file tree

Hide file tree

Showing 36 changed files with 64 additions and 175 deletions.
diff --git a/config/bouffalolab/common/lib/pw_rpc/pw_rpc.gni b/config/bouffalolab/common/lib/pw_rpc/pw_rpc.gni
@@ -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"
 

diff --git a/config/efr32/lib/pw_rpc/pw_rpc.gni b/config/efr32/lib/pw_rpc/pw_rpc.gni
@@ -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"

diff --git a/config/mbed/chip-gn/lib/pw_rpc/pw_rpc.gni b/config/mbed/chip-gn/lib/pw_rpc/pw_rpc.gni
@@ -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 =

diff --git a/config/nxp/lib/pw_rpc/pw_rpc.gni b/config/nxp/lib/pw_rpc/pw_rpc.gni
@@ -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"
 

diff --git a/config/qpg/lib/pw_rpc/pw_rpc.gni b/config/qpg/lib/pw_rpc/pw_rpc.gni
@@ -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 = [

diff --git a/examples/all-clusters-app/linux/with_pw_rpc.gni b/examples/all-clusters-app/linux/with_pw_rpc.gni
@@ -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"

diff --git a/examples/android/CHIPTest/args.gni b/examples/android/CHIPTest/args.gni
@@ -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"
 

diff --git a/examples/chef/linux/with_pw_rpc.gni b/examples/chef/linux/with_pw_rpc.gni
@@ -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"

diff --git a/examples/fabric-admin/with_pw_rpc.gni b/examples/fabric-admin/with_pw_rpc.gni
@@ -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"

diff --git a/examples/fabric-bridge-app/linux/with_pw_rpc.gni b/examples/fabric-bridge-app/linux/with_pw_rpc.gni
@@ -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"

diff --git a/examples/light-switch-app/genio/args.gni b/examples/light-switch-app/genio/args.gni
@@ -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
 

diff --git a/examples/light-switch-app/genio/build_for_wifi_args.gni b/examples/light-switch-app/genio/build_for_wifi_args.gni
@@ -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"
diff --git a/examples/light-switch-app/qpg/args.gni b/examples/light-switch-app/qpg/args.gni
@@ -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"
diff --git a/examples/lighting-app-data-mode-no-unique-id/linux/with_pw_rpc.gni b/examples/lighting-app-data-mode-no-unique-id/linux/with_pw_rpc.gni
@@ -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"

diff --git a/examples/lighting-app/bouffalolab/bl602/args.gni b/examples/lighting-app/bouffalolab/bl602/args.gni
@@ -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

diff --git a/examples/lighting-app/bouffalolab/bl702/args.gni b/examples/lighting-app/bouffalolab/bl702/args.gni
@@ -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

diff --git a/examples/lighting-app/bouffalolab/bl702l/args.gni b/examples/lighting-app/bouffalolab/bl702l/args.gni
@@ -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

diff --git a/examples/lighting-app/genio/args.gni b/examples/lighting-app/genio/args.gni
@@ -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
 

diff --git a/examples/lighting-app/genio/build_for_wifi_args.gni b/examples/lighting-app/genio/build_for_wifi_args.gni
@@ -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"
diff --git a/examples/lighting-app/linux/with_pw_rpc.gni b/examples/lighting-app/linux/with_pw_rpc.gni
@@ -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"

diff --git a/examples/lighting-app/qpg/args.gni b/examples/lighting-app/qpg/args.gni
@@ -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"
diff --git a/examples/lock-app/genio/args.gni b/examples/lock-app/genio/args.gni
@@ -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
 

diff --git a/examples/lock-app/genio/build_for_wifi_args.gni b/examples/lock-app/genio/build_for_wifi_args.gni
@@ -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"
diff --git a/examples/lock-app/qpg/args.gni b/examples/lock-app/qpg/args.gni
@@ -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"
diff --git a/examples/ota-requestor-app/genio/args.gni b/examples/ota-requestor-app/genio/args.gni
@@ -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
 

diff --git a/examples/ota-requestor-app/genio/build_for_wifi_args.gni b/examples/ota-requestor-app/genio/build_for_wifi_args.gni
@@ -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"
diff --git a/examples/shell/genio/args.gni b/examples/shell/genio/args.gni
@@ -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

diff --git a/examples/shell/qpg/args.gni b/examples/shell/qpg/args.gni
@@ -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

diff --git a/examples/thermostat/genio/args.gni b/examples/thermostat/genio/args.gni
@@ -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
 

diff --git a/examples/thermostat/genio/build_for_wifi_args.gni b/examples/thermostat/genio/build_for_wifi_args.gni
@@ -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"
diff --git a/examples/thermostat/qpg/args.gni b/examples/thermostat/qpg/args.gni
@@ -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"
diff --git a/src/app/tests/BUILD.gn b/src/app/tests/BUILD.gn
@@ -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",

diff --git a/src/lib/support/pw_log_chip/BUILD.gn b/src/lib/support/pw_log_chip/BUILD.gn