From efe5e0b40f932a7fbbd5d68b9f9315f2bcbb1728 Mon Sep 17 00:00:00 2001 From: Rob Oliver Date: Thu, 10 Nov 2022 14:19:27 -0500 Subject: [PATCH] Disable NRF pw tokenized tracing in RPC build This is failing to build after the pigweed roll, disable for now and we can fix it after we get this update done. --- config/nrfconnect/chip-module/CMakeLists.txt | 2 -- examples/lighting-app/nrfconnect/CMakeLists.txt | 15 ++------------- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/config/nrfconnect/chip-module/CMakeLists.txt b/config/nrfconnect/chip-module/CMakeLists.txt index c27f4bfe55e2e6..68e0e31d19abb5 100644 --- a/config/nrfconnect/chip-module/CMakeLists.txt +++ b/config/nrfconnect/chip-module/CMakeLists.txt @@ -266,8 +266,6 @@ endif() if (CONFIG_CHIP_PW_RPC) set(PIGWEED_DIR "//third_party/pigweed/repo") - chip_gn_arg_bool("chip_build_pw_trace_lib" "true") - chip_gn_arg_string("pw_trace_BACKEND" ${PIGWEED_DIR}/pw_trace_tokenized) chip_gn_arg_string("pw_assert_BACKEND" ${PIGWEED_DIR}/pw_assert_log:check_backend) chip_gn_arg_string("pw_log_BACKEND" ${PIGWEED_DIR}/pw_log_basic) chip_gn_arg("pw_build_LINK_DEPS" [\"${PIGWEED_DIR}/pw_assert:impl\",\ \"${PIGWEED_DIR}/pw_log:impl\"]) diff --git a/examples/lighting-app/nrfconnect/CMakeLists.txt b/examples/lighting-app/nrfconnect/CMakeLists.txt index a39de10f28bc48..02ee050825841e 100644 --- a/examples/lighting-app/nrfconnect/CMakeLists.txt +++ b/examples/lighting-app/nrfconnect/CMakeLists.txt @@ -94,7 +94,6 @@ pw_set_backend(pw_log pw_log_basic) pw_set_backend(pw_assert.check pw_assert_log.check_backend) pw_set_backend(pw_assert.assert pw_assert.assert_compatibility_backend) pw_set_backend(pw_sys_io pw_sys_io.nrfconnect) -pw_set_backend(pw_trace pw_trace_tokenized) set(dir_pw_third_party_nanopb "${CHIP_ROOT}/third_party/nanopb/repo" CACHE STRING "" FORCE) add_subdirectory(third_party/connectedhomeip/examples/platform/nrfconnect/pw_sys_io) @@ -194,7 +193,6 @@ target_sources(app PRIVATE ) target_include_directories(app PRIVATE - ${PIGWEED_ROOT}/pw_sys_io/public ${CHIP_ROOT}/src/lib/support ${CHIP_ROOT}/src/system ${NRFCONNECT_COMMON} @@ -209,8 +207,7 @@ target_compile_options(app PRIVATE "-DPW_RPC_DEVICE_SERVICE=1" "-DPW_RPC_LIGHTING_SERVICE=1" "-DPW_RPC_THREAD_SERVICE=1" - "-DPW_RPC_TRACING_SERVICE=1" - "-DPW_TRACE_BACKEND_SET=1") + ) target_link_libraries(app PRIVATE attributes_service.nanopb_rpc @@ -221,18 +218,10 @@ target_link_libraries(app PRIVATE thread_service.nanopb_rpc pw_checksum pw_hdlc + pw_hdlc.pw_rpc pw_log pw_rpc.server pw_sys_io - pw_trace_tokenized - pw_trace_tokenized.trace_buffer - pw_trace_tokenized.rpc_service - pw_trace_tokenized.protos.nanopb_rpc -) - -target_link_options(app - PUBLIC - "-T${PIGWEED_ROOT}/pw_tokenizer/pw_tokenizer_linker_sections.ld" ) endif(CONFIG_CHIP_PW_RPC)