Pigweed: Update to 67bc89cdda8c (project-chip#19560)

cpagravel · Jun 25, 2022 · 4327af4 · 4327af4
1 parent 5e451a2
commit 4327af4
Show file tree

Hide file tree

Showing 48 changed files with 773 additions and 106 deletions.
diff --git a/config/ameba/chip.cmake b/config/ameba/chip.cmake
@@ -110,7 +110,7 @@ if (matter_enable_rpc)
 #string(APPEND CHIP_GN_ARGS "remove_default_configs = [\"//third_party/connectedhomeip/third_party/pigweed/repo/pw_build:cpp17\"]\n")
 string(APPEND CHIP_GN_ARGS "chip_build_pw_rpc_lib = true\n")
 string(APPEND CHIP_GN_ARGS "pw_log_BACKEND = \"//third_party/connectedhomeip/third_party/pigweed/repo/pw_log_basic\"\n")
-string(APPEND CHIP_GN_ARGS "pw_assert_BACKEND = \"//third_party/connectedhomeip/third_party/pigweed/repo/pw_assert_log\"\n")
+string(APPEND CHIP_GN_ARGS "pw_assert_BACKEND = \"//third_party/connectedhomeip/third_party/pigweed/repo/pw_assert_log:check_backend\"\n")
 string(APPEND CHIP_GN_ARGS "pw_sys_io_BACKEND = \"//third_party/connectedhomeip/examples/platform/ameba/pw_sys_io:pw_sys_io_ameba\"\n")
 string(APPEND CHIP_GN_ARGS "dir_pw_third_party_nanopb = \"//third_party/connectedhomeip/third_party/nanopb/repo\"\n")
 string(APPEND CHIP_GN_ARGS "pw_build_LINK_DEPS = [\"//third_party/connectedhomeip/third_party/pigweed/repo/pw_assert:impl\", \"//third_party/connectedhomeip/third_party/pigweed/repo/pw_log:impl\"]\n")

diff --git a/config/bouffalolab/bl602/lib/pw_rpc/pw_rpc.gni b/config/bouffalolab/bl602/lib/pw_rpc/pw_rpc.gni
@@ -16,7 +16,7 @@ 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_assert_BACKEND = "$dir_pw_assert_log:check_backend"
 pw_sys_io_BACKEND =
  "${chip_root}/examples/platform/bl602/pw_sys_io:pw_sys_io_bl602"
 

diff --git a/config/efr32/lib/pw_rpc/pw_rpc.gni b/config/efr32/lib/pw_rpc/pw_rpc.gni
@@ -16,7 +16,7 @@ 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_assert_BACKEND = "$dir_pw_assert_log:check_backend"
 pw_sys_io_BACKEND =
  "${chip_root}/examples/platform/efr32/pw_sys_io:pw_sys_io_efr32"
 

diff --git a/config/esp32/components/chip/CMakeLists.txt b/config/esp32/components/chip/CMakeLists.txt
@@ -80,11 +80,11 @@ endif()
 
 if(CONFIG_ENABLE_PW_RPC)
  string(APPEND chip_gn_args "import(\"//build_overrides/pigweed.gni\")\n")
- chip_gn_arg_append("remove_default_configs" "[\"//third_party/connectedhomeip/third_party/pigweed/repo/pw_build:cpp17\"]")
+ chip_gn_arg_append("remove_default_configs" "[\"//third_party/connectedhomeip/third_party/pigweed/repo/pw_build:toolchain_cpp_standard\"]")
  chip_gn_arg_append("chip_build_pw_rpc_lib" "true")
  chip_gn_arg_append("chip_build_pw_trace_lib" "true")
  chip_gn_arg_append("pw_log_BACKEND" "\"//third_party/connectedhomeip/third_party/pigweed/repo/pw_log_basic\"")
- chip_gn_arg_append("pw_assert_BACKEND" "\"//third_party/connectedhomeip/third_party/pigweed/repo/pw_assert_log\"")
+ chip_gn_arg_append("pw_assert_BACKEND" "\"//third_party/connectedhomeip/third_party/pigweed/repo/pw_assert_log:check_backend\"")
  chip_gn_arg_append("pw_sys_io_BACKEND" "\"//third_party/connectedhomeip/examples/platform/esp32/pw_sys_io:pw_sys_io_esp32\"")
  chip_gn_arg_append("pw_trace_BACKEND" "\"//third_party/connectedhomeip/third_party/pigweed/repo/pw_trace_tokenized\"")
  chip_gn_arg_append("dir_pw_third_party_nanopb" "\"//third_party/connectedhomeip/third_party/nanopb/repo\"")

diff --git a/config/mbed/CMakeLists.txt b/config/mbed/CMakeLists.txt
@@ -383,8 +383,9 @@ target_include_directories(${APP_TARGET} PRIVATE
  ${PIGWEED_ROOT}/pw_sys_io/public
  ${PIGWEED_ROOT}/pw_assert/public
  ${PIGWEED_ROOT}/pw_assert/assert_lite_public_overrides
+ ${PIGWEED_ROOT}/pw_assert_log/assert_backend_public_overrides
+ ${PIGWEED_ROOT}/pw_assert_log/check_backend_public_overrides
  ${PIGWEED_ROOT}/pw_assert_log/public
- ${PIGWEED_ROOT}/pw_assert_log/public_overrides
  ${PIGWEED_ROOT}/pw_bytes/public
  ${PIGWEED_ROOT}/pw_checksum/public
  ${PIGWEED_ROOT}/pw_containers/public

diff --git a/config/mbed/chip-gn/lib/pw_rpc/pw_rpc.gni b/config/mbed/chip-gn/lib/pw_rpc/pw_rpc.gni
@@ -16,7 +16,7 @@ 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_assert_BACKEND = "$dir_pw_assert_log:check_backend"
 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/nrfconnect/chip-module/CMakeLists.txt b/config/nrfconnect/chip-module/CMakeLists.txt
@@ -252,7 +252,7 @@ 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)
+ 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\"])
 endif()

diff --git a/config/qpg/lib/pw_rpc/pw_rpc.gni b/config/qpg/lib/pw_rpc/pw_rpc.gni
@@ -16,7 +16,7 @@ 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_assert_BACKEND = "$dir_pw_assert_log:check_backend"
 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/ameba/chip_main.cmake b/examples/all-clusters-app/ameba/chip_main.cmake
@@ -18,7 +18,8 @@ set(dir_pw_third_party_nanopb "${chip_dir}/third_party/nanopb/repo" CACHE STRING
 
 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 pw_assert_log)
+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.ameba)
 pw_set_backend(pw_trace pw_trace_tokenized)
 
@@ -36,7 +37,7 @@ pw_proto_library(attributes_service
  STRIP_PREFIX
  ${chip_dir}/examples/common/pigweed/protos
  DEPS
- pw_protobuf.common_protos
+ pw_protobuf.common_proto
 )
 
 pw_proto_library(button_service
@@ -47,7 +48,7 @@ pw_proto_library(button_service
  STRIP_PREFIX
  ${chip_dir}/examples/common/pigweed/protos
  DEPS
- pw_protobuf.common_protos
+ pw_protobuf.common_proto
 )
 
 pw_proto_library(device_service
@@ -60,7 +61,7 @@ pw_proto_library(device_service
  STRIP_PREFIX
  ${chip_dir}/examples/common/pigweed/protos
  DEPS
- pw_protobuf.common_protos
+ pw_protobuf.common_proto
 )
 
 pw_proto_library(lighting_service
@@ -71,7 +72,7 @@ pw_proto_library(lighting_service
  STRIP_PREFIX
  ${chip_dir}/examples/common/pigweed/protos
  DEPS
- pw_protobuf.common_protos
+ pw_protobuf.common_proto
 )
 
 pw_proto_library(locking_service
@@ -82,7 +83,7 @@ pw_proto_library(locking_service
  STRIP_PREFIX
  ${chip_dir}/examples/common/pigweed/protos
  DEPS
- pw_protobuf.common_protos
+ pw_protobuf.common_proto
 )
 
 pw_proto_library(wifi_service
@@ -93,7 +94,7 @@ pw_proto_library(wifi_service
  PREFIX
  wifi_service
  DEPS
- pw_protobuf.common_protos
+ pw_protobuf.common_proto
  STRIP_PREFIX
  ${chip_dir}/examples/common/pigweed/protos
 )

diff --git a/examples/all-clusters-app/esp32/CMakeLists.txt b/examples/all-clusters-app/esp32/CMakeLists.txt
@@ -53,7 +53,8 @@ include(third_party/connectedhomeip/third_party/pigweed/repo/pw_build/pigweed.cm
 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 pw_assert_log)
+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.esp32)
 pw_set_backend(pw_trace pw_trace_tokenized)
 

diff --git a/examples/all-clusters-app/esp32/main/CMakeLists.txt b/examples/all-clusters-app/esp32/main/CMakeLists.txt
@@ -151,7 +151,7 @@ pw_proto_library(attributes_service
  STRIP_PREFIX
  ${CHIP_ROOT}/examples/common/pigweed/protos
  DEPS
- pw_protobuf.common_protos
+ pw_protobuf.common_proto
 )
 
 pw_proto_library(button_service
@@ -162,7 +162,7 @@ pw_proto_library(button_service
  STRIP_PREFIX
  ${CHIP_ROOT}/examples/common/pigweed/protos
  DEPS
- pw_protobuf.common_protos
+ pw_protobuf.common_proto
 )
 
 pw_proto_library(descriptor_service
@@ -173,7 +173,7 @@ pw_proto_library(descriptor_service
  STRIP_PREFIX
  ${CHIP_ROOT}/examples/common/pigweed/protos
  DEPS
- pw_protobuf.common_protos
+ pw_protobuf.common_proto
 )
 
 pw_proto_library(device_service
@@ -186,7 +186,7 @@ pw_proto_library(device_service
  STRIP_PREFIX
  ${CHIP_ROOT}/examples/common/pigweed/protos
  DEPS
- pw_protobuf.common_protos
+ pw_protobuf.common_proto
 )
 
 pw_proto_library(lighting_service
@@ -197,7 +197,7 @@ pw_proto_library(lighting_service
  STRIP_PREFIX
  ${CHIP_ROOT}/examples/common/pigweed/protos
  DEPS
- pw_protobuf.common_protos
+ pw_protobuf.common_proto
 )
 
 pw_proto_library(locking_service
@@ -208,7 +208,7 @@ pw_proto_library(locking_service
  STRIP_PREFIX
  ${CHIP_ROOT}/examples/common/pigweed/protos
  DEPS
- pw_protobuf.common_protos
+ pw_protobuf.common_proto
 )
 
 pw_proto_library(wifi_service
@@ -219,7 +219,7 @@ pw_proto_library(wifi_service
  PREFIX
  wifi_service
  DEPS
- pw_protobuf.common_protos
+ pw_protobuf.common_proto
  STRIP_PREFIX
  ${CHIP_ROOT}/examples/common/pigweed/protos
 )