From 3774243b3cdd5214431180b22e80eb890d82f1cb Mon Sep 17 00:00:00 2001 From: rgoliver Date: Thu, 1 Dec 2022 13:00:19 -0500 Subject: [PATCH] Update Pigweed to 8659ed599 (#23741) --- examples/all-clusters-app/esp32/CMakeLists.txt | 4 ++++ examples/all-clusters-app/esp32/main/CMakeLists.txt | 1 + examples/all-clusters-minimal-app/esp32/CMakeLists.txt | 5 +++++ examples/all-clusters-minimal-app/esp32/main/CMakeLists.txt | 1 + examples/chef/esp32/main/CMakeLists.txt | 1 + examples/lighting-app/esp32/CMakeLists.txt | 4 ++++ examples/lighting-app/esp32/main/CMakeLists.txt | 1 + examples/lock-app/esp32/CMakeLists.txt | 4 ++++ examples/ota-requestor-app/esp32/CMakeLists.txt | 4 ++++ examples/ota-requestor-app/esp32/main/CMakeLists.txt | 1 + examples/pigweed-app/esp32/CMakeLists.txt | 4 ++++ examples/platform/ameba/pw_sys_io/CMakeLists.txt | 4 +--- examples/platform/esp32/pw_sys_io/CMakeLists.txt | 3 +-- examples/platform/nrfconnect/pw_sys_io/CMakeLists.txt | 4 +++- examples/platform/telink/pw_sys_io/CMakeLists.txt | 2 +- .../temperature-measurement-app/esp32/main/CMakeLists.txt | 1 + third_party/pigweed/repo | 2 +- 17 files changed, 38 insertions(+), 8 deletions(-) diff --git a/examples/all-clusters-app/esp32/CMakeLists.txt b/examples/all-clusters-app/esp32/CMakeLists.txt index 171db2102b0836..0a8752ca6bcc27 100644 --- a/examples/all-clusters-app/esp32/CMakeLists.txt +++ b/examples/all-clusters-app/esp32/CMakeLists.txt @@ -53,6 +53,10 @@ flashing_script() if (CONFIG_ENABLE_PW_RPC) get_filename_component(CHIP_ROOT ./third_party/connectedhomeip REALPATH) include(third_party/connectedhomeip/third_party/pigweed/repo/pw_build/pigweed.cmake) +include($ENV{PW_ROOT}/pw_assert/backend.cmake) +include($ENV{PW_ROOT}/pw_log/backend.cmake) +include($ENV{PW_ROOT}/pw_sys_io/backend.cmake) +include($ENV{PW_ROOT}/pw_trace/backend.cmake) pw_set_module_config(pw_rpc_CONFIG pw_rpc.disable_global_mutex_config) diff --git a/examples/all-clusters-app/esp32/main/CMakeLists.txt b/examples/all-clusters-app/esp32/main/CMakeLists.txt index 1af642f45e4935..3293a8334d5e20 100644 --- a/examples/all-clusters-app/esp32/main/CMakeLists.txt +++ b/examples/all-clusters-app/esp32/main/CMakeLists.txt @@ -252,6 +252,7 @@ target_link_libraries(${COMPONENT_LIB} PUBLIC pw_log pw_rpc.server pw_sys_io + pw_trace pw_trace_tokenized pw_trace_tokenized.trace_buffer pw_trace_tokenized.rpc_service diff --git a/examples/all-clusters-minimal-app/esp32/CMakeLists.txt b/examples/all-clusters-minimal-app/esp32/CMakeLists.txt index 7bcb39178e6bee..c53fd3c05c92af 100644 --- a/examples/all-clusters-minimal-app/esp32/CMakeLists.txt +++ b/examples/all-clusters-minimal-app/esp32/CMakeLists.txt @@ -53,6 +53,11 @@ flashing_script() if (CONFIG_ENABLE_PW_RPC) get_filename_component(CHIP_ROOT ./third_party/connectedhomeip REALPATH) include(third_party/connectedhomeip/third_party/pigweed/repo/pw_build/pigweed.cmake) +include($ENV{PW_ROOT}/pw_assert/backend.cmake) +include($ENV{PW_ROOT}/pw_log/backend.cmake) +include($ENV{PW_ROOT}/pw_sys_io/backend.cmake) +include($ENV{PW_ROOT}/pw_trace/backend.cmake) + pw_set_module_config(pw_rpc_CONFIG pw_rpc.disable_global_mutex_config) pw_set_backend(pw_log pw_log_basic) pw_set_backend(pw_assert.check pw_assert_log.check_backend) diff --git a/examples/all-clusters-minimal-app/esp32/main/CMakeLists.txt b/examples/all-clusters-minimal-app/esp32/main/CMakeLists.txt index 31be1f41050a74..6b0dc3f6f0d6ca 100644 --- a/examples/all-clusters-minimal-app/esp32/main/CMakeLists.txt +++ b/examples/all-clusters-minimal-app/esp32/main/CMakeLists.txt @@ -243,6 +243,7 @@ target_link_libraries(${COMPONENT_LIB} PUBLIC pw_log pw_rpc.server pw_sys_io + pw_trace pw_trace_tokenized pw_trace_tokenized.trace_buffer pw_trace_tokenized.rpc_service diff --git a/examples/chef/esp32/main/CMakeLists.txt b/examples/chef/esp32/main/CMakeLists.txt index 777c891486b380..00a46722388cc9 100644 --- a/examples/chef/esp32/main/CMakeLists.txt +++ b/examples/chef/esp32/main/CMakeLists.txt @@ -194,6 +194,7 @@ target_link_libraries(${COMPONENT_LIB} PUBLIC pw_log pw_rpc.server pw_sys_io + pw_trace pw_trace_tokenized pw_trace_tokenized.trace_buffer pw_trace_tokenized.rpc_service diff --git a/examples/lighting-app/esp32/CMakeLists.txt b/examples/lighting-app/esp32/CMakeLists.txt index b865807ad8e076..746f70379ef1c1 100644 --- a/examples/lighting-app/esp32/CMakeLists.txt +++ b/examples/lighting-app/esp32/CMakeLists.txt @@ -53,6 +53,10 @@ flashing_script() if (CONFIG_ENABLE_PW_RPC) get_filename_component(CHIP_ROOT ./third_party/connectedhomeip REALPATH) include(third_party/connectedhomeip/third_party/pigweed/repo/pw_build/pigweed.cmake) +include($ENV{PW_ROOT}/pw_assert/backend.cmake) +include($ENV{PW_ROOT}/pw_log/backend.cmake) +include($ENV{PW_ROOT}/pw_sys_io/backend.cmake) +include($ENV{PW_ROOT}/pw_trace/backend.cmake) pw_set_module_config(pw_rpc_CONFIG pw_rpc.disable_global_mutex_config) diff --git a/examples/lighting-app/esp32/main/CMakeLists.txt b/examples/lighting-app/esp32/main/CMakeLists.txt index f7517c62295e8a..1e25058d3cb3d5 100644 --- a/examples/lighting-app/esp32/main/CMakeLists.txt +++ b/examples/lighting-app/esp32/main/CMakeLists.txt @@ -208,6 +208,7 @@ target_link_libraries(${COMPONENT_LIB} PUBLIC pw_log pw_rpc.server pw_sys_io + pw_trace pw_trace_tokenized pw_trace_tokenized.trace_buffer pw_trace_tokenized.rpc_service diff --git a/examples/lock-app/esp32/CMakeLists.txt b/examples/lock-app/esp32/CMakeLists.txt index 9cc498c3c6863a..24110deb8352c2 100644 --- a/examples/lock-app/esp32/CMakeLists.txt +++ b/examples/lock-app/esp32/CMakeLists.txt @@ -46,6 +46,10 @@ idf_build_set_property(COMPILE_OPTIONS "-Wno-error=maybe-uninitialized" APPEND) if (CONFIG_ENABLE_PW_RPC) get_filename_component(CHIP_ROOT ./third_party/connectedhomeip REALPATH) include(third_party/connectedhomeip/third_party/pigweed/repo/pw_build/pigweed.cmake) +include($ENV{PW_ROOT}/pw_assert/backend.cmake) +include($ENV{PW_ROOT}/pw_log/backend.cmake) +include($ENV{PW_ROOT}/pw_sys_io/backend.cmake) +include($ENV{PW_ROOT}/pw_trace/backend.cmake) pw_set_module_config(pw_rpc_CONFIG pw_rpc.disable_global_mutex_config) pw_set_backend(pw_log pw_log_basic) diff --git a/examples/ota-requestor-app/esp32/CMakeLists.txt b/examples/ota-requestor-app/esp32/CMakeLists.txt index 6d522a07c7d1fd..567bd30267ff78 100644 --- a/examples/ota-requestor-app/esp32/CMakeLists.txt +++ b/examples/ota-requestor-app/esp32/CMakeLists.txt @@ -46,6 +46,10 @@ idf_build_set_property(COMPILE_OPTIONS "-Wno-error=maybe-uninitialized" APPEND) if (CONFIG_ENABLE_PW_RPC) get_filename_component(CHIP_ROOT ./third_party/connectedhomeip REALPATH) include(third_party/connectedhomeip/third_party/pigweed/repo/pw_build/pigweed.cmake) +include($ENV{PW_ROOT}/pw_assert/backend.cmake) +include($ENV{PW_ROOT}/pw_log/backend.cmake) +include($ENV{PW_ROOT}/pw_sys_io/backend.cmake) +include($ENV{PW_ROOT}/pw_trace/backend.cmake) pw_set_module_config(pw_rpc_CONFIG pw_rpc.disable_global_mutex_config) pw_set_backend(pw_log pw_log_basic) diff --git a/examples/ota-requestor-app/esp32/main/CMakeLists.txt b/examples/ota-requestor-app/esp32/main/CMakeLists.txt index 184e29acd10a32..c711b84c438ef5 100644 --- a/examples/ota-requestor-app/esp32/main/CMakeLists.txt +++ b/examples/ota-requestor-app/esp32/main/CMakeLists.txt @@ -177,6 +177,7 @@ target_link_libraries(${COMPONENT_LIB} PUBLIC pw_log pw_rpc.server pw_sys_io + pw_trace pw_trace_tokenized pw_trace_tokenized.trace_buffer pw_trace_tokenized.rpc_service diff --git a/examples/pigweed-app/esp32/CMakeLists.txt b/examples/pigweed-app/esp32/CMakeLists.txt index 81aa021ac5d815..08d38727e94e1b 100644 --- a/examples/pigweed-app/esp32/CMakeLists.txt +++ b/examples/pigweed-app/esp32/CMakeLists.txt @@ -47,6 +47,10 @@ set(PIGWEED_ROOT "${CHIP_ROOT}/third_party/pigweed/repo") include(${PIGWEED_ROOT}/pw_build/pigweed.cmake) include(${PIGWEED_ROOT}/pw_protobuf_compiler/proto.cmake) +include($ENV{PW_ROOT}/pw_assert/backend.cmake) +include($ENV{PW_ROOT}/pw_log/backend.cmake) +include($ENV{PW_ROOT}/pw_sys_io/backend.cmake) +include($ENV{PW_ROOT}/pw_trace/backend.cmake) pw_set_module_config(pw_rpc_CONFIG pw_rpc.disable_global_mutex_config) pw_set_backend(pw_log pw_log_basic) diff --git a/examples/platform/ameba/pw_sys_io/CMakeLists.txt b/examples/platform/ameba/pw_sys_io/CMakeLists.txt index c0ff32a9f695cb..04bc802eda0eb8 100644 --- a/examples/platform/ameba/pw_sys_io/CMakeLists.txt +++ b/examples/platform/ameba/pw_sys_io/CMakeLists.txt @@ -1,11 +1,9 @@ include($ENV{PW_ROOT}/pw_build/pigweed.cmake) # This is compiled in gn build, just provide headers and let linker sort it out. -pw_add_module_library(pw_sys_io.ameba - SOURCES +pw_add_library(pw_sys_io.ameba INTERFACE PRIVATE_DEPS pw_sys_io HEADERS public ) - diff --git a/examples/platform/esp32/pw_sys_io/CMakeLists.txt b/examples/platform/esp32/pw_sys_io/CMakeLists.txt index 2ca42f77764a91..7002fb633d5b23 100644 --- a/examples/platform/esp32/pw_sys_io/CMakeLists.txt +++ b/examples/platform/esp32/pw_sys_io/CMakeLists.txt @@ -1,8 +1,7 @@ include($ENV{PW_ROOT}/pw_build/pigweed.cmake) # This is compiled in gn build, just provide headers and let linker sort it out. -pw_add_module_library(pw_sys_io.esp32 - SOURCES +pw_add_library(pw_sys_io.esp32 INTERFACE PRIVATE_DEPS pw_sys_io HEADERS diff --git a/examples/platform/nrfconnect/pw_sys_io/CMakeLists.txt b/examples/platform/nrfconnect/pw_sys_io/CMakeLists.txt index 9e3a33c158b099..329a95cc7ff8cc 100644 --- a/examples/platform/nrfconnect/pw_sys_io/CMakeLists.txt +++ b/examples/platform/nrfconnect/pw_sys_io/CMakeLists.txt @@ -8,9 +8,11 @@ target_compile_options(suppress_zephyr_warnings INTERFACE -Wno-undef ) -pw_add_module_library(pw_sys_io.nrfconnect +pw_add_library(pw_sys_io.nrfconnect STATIC SOURCES sys_io_nrfconnect.cc + PUBLIC_INCLUDES + public PRIVATE_DEPS pw_sys_io suppress_zephyr_warnings diff --git a/examples/platform/telink/pw_sys_io/CMakeLists.txt b/examples/platform/telink/pw_sys_io/CMakeLists.txt index 43263ad2fad2dc..f8675a4ec1f05a 100644 --- a/examples/platform/telink/pw_sys_io/CMakeLists.txt +++ b/examples/platform/telink/pw_sys_io/CMakeLists.txt @@ -8,7 +8,7 @@ target_compile_options(suppress_zephyr_warnings INTERFACE -Wno-undef ) -pw_add_module_library(pw_sys_io.telink +pw_add_library(pw_sys_io.telink STATIC SOURCES sys_io_telink.cc PRIVATE_DEPS diff --git a/examples/temperature-measurement-app/esp32/main/CMakeLists.txt b/examples/temperature-measurement-app/esp32/main/CMakeLists.txt index 68e49f160f79e0..dbf518ff18844a 100644 --- a/examples/temperature-measurement-app/esp32/main/CMakeLists.txt +++ b/examples/temperature-measurement-app/esp32/main/CMakeLists.txt @@ -168,6 +168,7 @@ target_link_libraries(${COMPONENT_LIB} PUBLIC pw_log pw_rpc.server pw_sys_io + pw_trace pw_trace_tokenized pw_trace_tokenized.trace_buffer pw_trace_tokenized.rpc_service diff --git a/third_party/pigweed/repo b/third_party/pigweed/repo index 9264e6862cc408..8659ed5997578e 160000 --- a/third_party/pigweed/repo +++ b/third_party/pigweed/repo @@ -1 +1 @@ -Subproject commit 9264e6862cc40868a902e5e4ac4e43e2f7eb040d +Subproject commit 8659ed5997578ec62e89029a8e7b450b665d374d