From f3c209e05d0eebc0871ac30ad297b5562923f021 Mon Sep 17 00:00:00 2001 From: Rob Oliver Date: Thu, 20 Oct 2022 09:36:51 -0400 Subject: [PATCH] Update Pigweed to 9264e686 --- .gn | 3 --- BUILD.gn | 6 ++--- build/config/compiler/BUILD.gn | 11 +++++--- build/config/mac/mac_sdk.gni | 2 +- config/ameba/args.gni | 2 -- .../bouffalolab/common/lib/pw_rpc/pw_rpc.gni | 1 - config/efr32/lib/pw_rpc/pw_rpc.gni | 1 - config/esp32/.gn | 5 ++++ config/esp32/args.gni | 2 -- config/mbed/CMakeLists.txt | 3 +++ config/mbed/chip-gn/lib/pw_rpc/pw_rpc.gni | 1 - config/qpg/lib/pw_rpc/pw_rpc.gni | 1 - config/standalone/args.gni | 1 + .../all-clusters-app/ameba/chip_main.cmake | 1 + .../all-clusters-app/cc13x2x7_26x2x7/args.gni | 1 + .../all-clusters-app/esp32/CMakeLists.txt | 4 --- .../esp32/main/CMakeLists.txt | 1 + .../all-clusters-app/infineon/psoc6/args.gni | 1 + examples/all-clusters-app/nxp/mw320/args.gni | 1 + examples/all-clusters-app/tizen/.gn | 1 + .../cc13x2x7_26x2x7/.gn | 1 - .../cc13x2x7_26x2x7/args.gni | 1 + .../esp32/CMakeLists.txt | 4 --- .../esp32/main/CMakeLists.txt | 1 + .../infineon/psoc6/args.gni | 1 + examples/all-clusters-minimal-app/tizen/.gn | 1 + .../build_overrides/pigweed_environment.gni | 13 +++++----- examples/chef/efr32/.gn | 1 + examples/chef/efr32/args.gni | 1 + examples/chef/esp32/CMakeLists.txt | 4 --- examples/chef/esp32/main/CMakeLists.txt | 1 + examples/chef/linux/BUILD.gn | 7 +++++- examples/chef/linux/with_pw_rpc.gni | 1 - examples/chef/nrfconnect/CMakeLists.txt | 13 ++-------- examples/common/pigweed/RpcService.cpp | 2 +- examples/common/pigweed/rpc_console/BUILD.gn | 2 +- examples/common/pigweed/system_rpc_server.cc | 2 +- .../nxp/k32w/k32w0/args.gni | 1 + examples/darwin-framework-tool/.gn | 1 - .../dynamic-bridge-app/linux/with_pw_rpc.gni | 1 - .../light-switch-app/ameba/chip_main.cmake | 1 + examples/light-switch-app/efr32/.gn | 1 + examples/light-switch-app/efr32/args.gni | 1 + examples/lighting-app/ameba/chip_main.cmake | 1 + examples/lighting-app/beken/args.gni | 1 + .../lighting-app/bouffalolab/bl602/args.gni | 6 +++++ .../lighting-app/bouffalolab/bl702/args.gni | 1 + examples/lighting-app/efr32/.gn | 1 + examples/lighting-app/efr32/args.gni | 1 + examples/lighting-app/esp32/CMakeLists.txt | 4 +-- .../lighting-app/esp32/main/CMakeLists.txt | 1 + examples/lighting-app/genio/.gn | 1 + examples/lighting-app/genio/args.gni | 1 + .../lighting-app/infineon/cyw30739/args.gni | 1 + examples/lighting-app/infineon/psoc6/args.gni | 1 + examples/lighting-app/linux/with_pw_rpc.gni | 1 - .../lighting-app/nrfconnect/CMakeLists.txt | 1 + examples/lighting-app/nxp/k32w/k32w0/args.gni | 1 + examples/lighting-app/qpg/args.gni | 1 + examples/lighting-app/tizen/.gn | 1 + examples/lock-app/cc13x2x7_26x2x7/args.gni | 1 + examples/lock-app/cc32xx/args.gni | 1 + examples/lock-app/efr32/.gn | 1 + examples/lock-app/efr32/args.gni | 1 + examples/lock-app/esp32/CMakeLists.txt | 4 +-- examples/lock-app/esp32/main/CMakeLists.txt | 1 + examples/lock-app/infineon/cyw30739/args.gni | 1 + examples/lock-app/infineon/psoc6/args.gni | 1 + examples/lock-app/nxp/k32w/k32w0/args.gni | 1 + examples/lock-app/qpg/args.gni | 1 + .../ota-requestor-app/esp32/CMakeLists.txt | 4 +-- .../esp32/main/CMakeLists.txt | 1 + .../infineon/cyw30739/args.gni | 1 + .../cc13x2x7_26x2x7/args.gni | 1 + examples/persistent-storage/efr32/args.gni | 1 + .../infineon/psoc6/args.gni | 1 + examples/persistent-storage/qpg/args.gni | 1 + examples/pigweed-app/ameba/chip_main.cmake | 1 + examples/pigweed-app/efr32/args.gni | 1 + examples/pigweed-app/esp32/CMakeLists.txt | 4 +-- .../pigweed-app/esp32/main/CMakeLists.txt | 1 + .../pigweed-app/nrfconnect/CMakeLists.txt | 2 ++ examples/platform/linux/system_rpc_server.cc | 2 +- examples/pump-app/cc13x2x7_26x2x7/args.gni | 1 + .../cc13x2x7_26x2x7/args.gni | 1 + examples/shell/cc13x2x7_26x2x7/args.gni | 1 + examples/shell/efr32/args.gni | 1 + examples/shell/genio/args.gni | 1 + examples/shell/nxp/k32w/k32w0/args.gni | 1 + examples/shell/qpg/args.gni | 1 + .../esp32/CMakeLists.txt | 4 +-- .../esp32/main/CMakeLists.txt | 1 + examples/thermostat/efr32/.gn | 1 + examples/thermostat/efr32/args.gni | 1 + examples/window-app/efr32/.gn | 1 + examples/window-app/efr32/args.gni | 1 + scripts/bootstrap.sh | 14 +++++++++++ scripts/constraints.txt | 25 +++++++++++++------ scripts/requirements.txt | 5 +++- scripts/run_codegen_targets.sh | 2 +- src/platform/bouffalolab/BL702/args.gni | 6 +++++ src/platform/qpg/args.gni | 6 +++++ src/test_driver/efr32/.gn | 6 +++++ third_party/pigweed/repo | 2 +- 104 files changed, 174 insertions(+), 78 deletions(-) diff --git a/.gn b/.gn index 5da05d85b4d8e0..9577b6db802e79 100644 --- a/.gn +++ b/.gn @@ -29,9 +29,6 @@ default_args = { pw_build_PIP_CONSTRAINTS = [ "//scripts/constraints.txt" ] pw_build_PIP_REQUIREMENTS = [ "//scripts/requirements.txt" ] - # Use the new Python build and merged 'pigweed' Python package. - pw_build_USE_NEW_PYTHON_BUILD = true - # GN target to use for the default Python build venv. pw_build_PYTHON_BUILD_VENV = "//:matter_build_venv" } diff --git a/BUILD.gn b/BUILD.gn index e21616f90f9a87..e4e1b8e02da1b5 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -103,7 +103,7 @@ if (current_toolchain != "${dir_pw_toolchain}/default:default") { "$dir_pw_watch/py", ] - # Matter's in-tree pw_python_package or pw_create_python_source_tree targets. + # Matter's in-tree pw_python_package or pw_python_distribution targets. _matter_python_packages = [ "//integrations/mobly:chip_mobly", "//examples/chef", @@ -119,7 +119,7 @@ if (current_toolchain != "${dir_pw_toolchain}/default:default") { source_packages = _matter_python_packages + _pigweed_python_packages } - pw_internal_pip_install("pip_install_matter_packages") { + pw_python_pip_install("pip_install_matter_packages") { packages = [ "//examples/common/pigweed/rpc_console:chip_rpc_distribution" ] } @@ -133,7 +133,7 @@ if (current_toolchain != "${dir_pw_toolchain}/default:default") { } # These pw_python_package targets will be installed using 'pip install --editable' - pw_internal_pip_install("pip_install_editable_matter_packages") { + pw_python_pip_install("pip_install_editable_matter_packages") { packages = [ "//integrations/mobly:chip_mobly", "//examples/chef", diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn index 7676c1c577c461..96cdcd00256e3f 100644 --- a/build/config/compiler/BUILD.gn +++ b/build/config/compiler/BUILD.gn @@ -194,9 +194,8 @@ config("optimize_default") { config("disabled_warnings") { cflags = [ "-Wno-deprecated-declarations", - "-Wno-unknown-warning-option", - "-Wno-maybe-uninitialized", "-Wno-missing-field-initializers", + "-Wno-unknown-warning-option", "-Wno-unused-parameter", ] if (!is_debug) { @@ -205,8 +204,9 @@ config("disabled_warnings") { } if (!is_clang) { cflags += [ - "-Wno-psabi", "-Wno-cast-function-type", + "-Wno-psabi", + "-Wno-maybe-uninitialized", ] } } @@ -291,9 +291,12 @@ config("disabled_warnings_third_party") { cflags = [ "-Wno-unused", "-Wno-format", - "-Wno-maybe-uninitialized", "-Wno-address", ] + + if (!is_clang) { + cflags += [ "-Wno-maybe-uninitialized" ] + } } config("warnings_third_party") { diff --git a/build/config/mac/mac_sdk.gni b/build/config/mac/mac_sdk.gni index 9f3380e9af5eba..0e7f02b5bb3399 100644 --- a/build/config/mac/mac_sdk.gni +++ b/build/config/mac/mac_sdk.gni @@ -28,7 +28,7 @@ if (current_os != "mac") { target_sdk = current_os } -deployment_target = "10.15" +deployment_target = "11.0" if (current_os == "mac") { if (current_cpu == "arm64") { deployment_target = "11.0" diff --git a/config/ameba/args.gni b/config/ameba/args.gni index d09b1f5cba9843..7d3d91a602ccf4 100755 --- a/config/ameba/args.gni +++ b/config/ameba/args.gni @@ -16,7 +16,6 @@ # options are used from examples/. import("//build_overrides/pigweed.gni") -import("$dir_pw_span/polyfill.gni") chip_device_platform = "ameba" @@ -38,5 +37,4 @@ custom_toolchain = "//third_party/connectedhomeip/config/ameba/toolchain:ameba" pw_build_PIP_CONSTRAINTS = [ "//third_party/connectedhomeip/scripts/constraints.txt" ] -pw_span_ENABLE_STD_SPAN_POLYFILL = false cpp_standard = "c++17" diff --git a/config/bouffalolab/common/lib/pw_rpc/pw_rpc.gni b/config/bouffalolab/common/lib/pw_rpc/pw_rpc.gni index c8300fa010d569..2cfbc034e875eb 100644 --- a/config/bouffalolab/common/lib/pw_rpc/pw_rpc.gni +++ b/config/bouffalolab/common/lib/pw_rpc/pw_rpc.gni @@ -19,7 +19,6 @@ pw_log_BACKEND = "$dir_pw_log_basic" pw_assert_BACKEND = "$dir_pw_assert_log" pw_sys_io_BACKEND = "${chip_root}/examples/platform/bouffalolab/common/rpc/pw_sys_io:pw_sys_io" -pw_span_ENABLE_STD_SPAN_POLYFILL = false pw_string_CONFIG = "${chip_root}/config/bouffalolab/common/lib/pw_rpc:pw_string_dep" diff --git a/config/efr32/lib/pw_rpc/pw_rpc.gni b/config/efr32/lib/pw_rpc/pw_rpc.gni index 2c8aaf4d14fba1..68f1c6154f4a91 100644 --- a/config/efr32/lib/pw_rpc/pw_rpc.gni +++ b/config/efr32/lib/pw_rpc/pw_rpc.gni @@ -19,7 +19,6 @@ pw_log_BACKEND = "$dir_pw_log_basic" 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" -pw_span_ENABLE_STD_SPAN_POLYFILL = false pw_build_LINK_DEPS = [ "$dir_pw_assert:impl", diff --git a/config/esp32/.gn b/config/esp32/.gn index 2cb77a0fa8950c..4b3520ab15c9a6 100644 --- a/config/esp32/.gn +++ b/config/esp32/.gn @@ -24,5 +24,10 @@ default_args = { target_cpu = "esp32" target_os = "freertos" + pw_build_PIP_CONSTRAINTS = + [ "//third_party/connectedhomeip/scripts/constraints.txt" ] + pw_build_PIP_REQUIREMENTS = + [ "//third_party/connectedhomeip/scripts/requirements.txt" ] + import("//args.gni") } diff --git a/config/esp32/args.gni b/config/esp32/args.gni index 1f6a6bf0987103..939c39e85b8e2d 100644 --- a/config/esp32/args.gni +++ b/config/esp32/args.gni @@ -15,7 +15,6 @@ # Options from standalone-chip.mk that differ from configure defaults. These # options are used from examples/. import("//build_overrides/pigweed.gni") -import("$dir_pw_span/polyfill.gni") chip_device_platform = "esp32" chip_project_config_include = "" @@ -39,4 +38,3 @@ custom_toolchain = "//third_party/connectedhomeip/config/esp32/toolchain:esp32" # whatever pigweed ships with pw_build_PIP_CONSTRAINTS = [ "//third_party/connectedhomeip/scripts/constraints.txt" ] -pw_span_ENABLE_STD_SPAN_POLYFILL = false diff --git a/config/mbed/CMakeLists.txt b/config/mbed/CMakeLists.txt index 1829bf81caf8e2..ecef938c0a8f07 100644 --- a/config/mbed/CMakeLists.txt +++ b/config/mbed/CMakeLists.txt @@ -395,6 +395,7 @@ target_include_directories(${APP_TARGET} PRIVATE ${PIGWEED_ROOT}/pw_log_basic/public_overrides ${PIGWEED_ROOT}/pw_span/public_overrides ${PIGWEED_ROOT}/pw_span/public + ${PIGWEED_ROOT}/pw_string/public ${PIGWEED_ROOT}/pw_sync/public ${PIGWEED_ROOT}/pw_polyfill/public ${PIGWEED_ROOT}/pw_polyfill/standard_library_public @@ -410,6 +411,8 @@ target_include_directories(${APP_TARGET} PRIVATE ${PIGWEED_ROOT}/pw_function/public ${PIGWEED_ROOT}/pw_preprocessor/public ${PIGWEED_ROOT}/pw_rpc/system_server/public + ${PIGWEED_ROOT}/third_party/fuchsia/repo/sdk/lib/fit/include + ${PIGWEED_ROOT}/third_party/fuchsia/repo/sdk/lib/stdcompat/include ${CHIP_ROOT}/third_party/nanopb/repo ${CHIP_ROOT}/examples/common diff --git a/config/mbed/chip-gn/lib/pw_rpc/pw_rpc.gni b/config/mbed/chip-gn/lib/pw_rpc/pw_rpc.gni index b2033e5280c539..2b03f6b4c9958c 100644 --- a/config/mbed/chip-gn/lib/pw_rpc/pw_rpc.gni +++ b/config/mbed/chip-gn/lib/pw_rpc/pw_rpc.gni @@ -21,7 +21,6 @@ pw_sys_io_BACKEND = "${chip_root}/examples/platform/mbed/pw_sys_io:pw_sys_io_mbed" pw_rpc_system_server_BACKEND = "${chip_root}/examples/common/pigweed:system_rpc_server" -pw_span_ENABLE_STD_SPAN_POLYFILL = false pw_build_LINK_DEPS = [ "$dir_pw_assert:impl", diff --git a/config/qpg/lib/pw_rpc/pw_rpc.gni b/config/qpg/lib/pw_rpc/pw_rpc.gni index 4100605a1445b1..60fb93e6b8fc44 100644 --- a/config/qpg/lib/pw_rpc/pw_rpc.gni +++ b/config/qpg/lib/pw_rpc/pw_rpc.gni @@ -18,7 +18,6 @@ import("//build_overrides/pigweed.gni") pw_log_BACKEND = "$dir_pw_log_basic" 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_span_ENABLE_STD_SPAN_POLYFILL = false pw_build_LINK_DEPS = [ "$dir_pw_assert:impl", diff --git a/config/standalone/args.gni b/config/standalone/args.gni index 32235745930867..89e186b4edb8a4 100644 --- a/config/standalone/args.gni +++ b/config/standalone/args.gni @@ -19,3 +19,4 @@ import("//build_overrides/chip.gni") chip_build_tests = false pw_build_PIP_CONSTRAINTS = [ "${chip_root}/scripts/constraints.txt" ] +pw_build_PIP_REQUIREMENTS = [ "${chip_root}/scripts/requirements.txt" ] diff --git a/examples/all-clusters-app/ameba/chip_main.cmake b/examples/all-clusters-app/ameba/chip_main.cmake index 35d0b2877e3788..aa6cc0764b6f05 100755 --- a/examples/all-clusters-app/ameba/chip_main.cmake +++ b/examples/all-clusters-app/ameba/chip_main.cmake @@ -234,6 +234,7 @@ target_link_libraries(${chip_main} PUBLIC pw_hdlc pw_log pw_rpc.server + pw_sys_io pw_trace_tokenized pw_trace_tokenized.trace_buffer pw_trace_tokenized.rpc_service diff --git a/examples/all-clusters-app/cc13x2x7_26x2x7/args.gni b/examples/all-clusters-app/cc13x2x7_26x2x7/args.gni index 8f67c7f5edd0c7..9228f70c4a0f03 100644 --- a/examples/all-clusters-app/cc13x2x7_26x2x7/args.gni +++ b/examples/all-clusters-app/cc13x2x7_26x2x7/args.gni @@ -13,6 +13,7 @@ # limitations under the License. import("//build_overrides/chip.gni") +import("${chip_root}/config/standalone/args.gni") import("${chip_root}/examples/platform/cc13x2_26x2/args.gni") ti_simplelink_sdk_target = get_label_info(":sdk", "label_no_toolchain") diff --git a/examples/all-clusters-app/esp32/CMakeLists.txt b/examples/all-clusters-app/esp32/CMakeLists.txt index fad386531fb057..171db2102b0836 100644 --- a/examples/all-clusters-app/esp32/CMakeLists.txt +++ b/examples/all-clusters-app/esp32/CMakeLists.txt @@ -66,8 +66,4 @@ add_subdirectory(third_party/connectedhomeip/third_party/pigweed/repo) add_subdirectory(third_party/connectedhomeip/third_party/nanopb/repo) add_subdirectory(third_party/connectedhomeip/examples/platform/esp32/pw_sys_io) -get_target_property(_target_cxx_flags pw_build.cpp17 INTERFACE_COMPILE_OPTIONS) -list(REMOVE_ITEM _target_cxx_flags $<$:-std=c++17>) -list(APPEND _target_cxx_flags $<$:-std=gnu++17>) -set_target_properties(pw_build.cpp17 PROPERTIES INTERFACE_COMPILE_OPTIONS "${_target_cxx_flags}") endif(CONFIG_ENABLE_PW_RPC) diff --git a/examples/all-clusters-app/esp32/main/CMakeLists.txt b/examples/all-clusters-app/esp32/main/CMakeLists.txt index 11445b48bd0df4..1af642f45e4935 100644 --- a/examples/all-clusters-app/esp32/main/CMakeLists.txt +++ b/examples/all-clusters-app/esp32/main/CMakeLists.txt @@ -251,6 +251,7 @@ target_link_libraries(${COMPONENT_LIB} PUBLIC pw_hdlc pw_log pw_rpc.server + pw_sys_io pw_trace_tokenized pw_trace_tokenized.trace_buffer pw_trace_tokenized.rpc_service diff --git a/examples/all-clusters-app/infineon/psoc6/args.gni b/examples/all-clusters-app/infineon/psoc6/args.gni index ce7a2ab93e794d..54204a83fb9106 100644 --- a/examples/all-clusters-app/infineon/psoc6/args.gni +++ b/examples/all-clusters-app/infineon/psoc6/args.gni @@ -14,6 +14,7 @@ import("//build_overrides/chip.gni") import("//build_overrides/pigweed.gni") +import("${chip_root}/config/standalone/args.gni") import("${chip_root}/src/platform/Infineon/PSOC6/args.gni") psoc6_target_project = diff --git a/examples/all-clusters-app/nxp/mw320/args.gni b/examples/all-clusters-app/nxp/mw320/args.gni index d17e18bb109f50..f35eae619495c8 100644 --- a/examples/all-clusters-app/nxp/mw320/args.gni +++ b/examples/all-clusters-app/nxp/mw320/args.gni @@ -13,6 +13,7 @@ # limitations under the License. import("//build_overrides/chip.gni") +import("${chip_root}/config/standalone/args.gni") import("${chip_root}/examples/platform/nxp/mw320/args.gni") mw320_sdk_target = get_label_info(":sdk", "label_no_toolchain") diff --git a/examples/all-clusters-app/tizen/.gn b/examples/all-clusters-app/tizen/.gn index c50b81609edec2..edd34d34bd13d2 100644 --- a/examples/all-clusters-app/tizen/.gn +++ b/examples/all-clusters-app/tizen/.gn @@ -22,5 +22,6 @@ check_system_includes = true default_args = { target_os = "tizen" + import("//args.gni") } diff --git a/examples/all-clusters-minimal-app/cc13x2x7_26x2x7/.gn b/examples/all-clusters-minimal-app/cc13x2x7_26x2x7/.gn index 3d48789e30ab3d..0adefc6ff99c6a 100644 --- a/examples/all-clusters-minimal-app/cc13x2x7_26x2x7/.gn +++ b/examples/all-clusters-minimal-app/cc13x2x7_26x2x7/.gn @@ -23,6 +23,5 @@ check_system_includes = true default_args = { target_cpu = "arm" target_os = "freertos" - import("//args.gni") } diff --git a/examples/all-clusters-minimal-app/cc13x2x7_26x2x7/args.gni b/examples/all-clusters-minimal-app/cc13x2x7_26x2x7/args.gni index 8f67c7f5edd0c7..9228f70c4a0f03 100644 --- a/examples/all-clusters-minimal-app/cc13x2x7_26x2x7/args.gni +++ b/examples/all-clusters-minimal-app/cc13x2x7_26x2x7/args.gni @@ -13,6 +13,7 @@ # limitations under the License. import("//build_overrides/chip.gni") +import("${chip_root}/config/standalone/args.gni") import("${chip_root}/examples/platform/cc13x2_26x2/args.gni") ti_simplelink_sdk_target = get_label_info(":sdk", "label_no_toolchain") diff --git a/examples/all-clusters-minimal-app/esp32/CMakeLists.txt b/examples/all-clusters-minimal-app/esp32/CMakeLists.txt index a1d45e27a1df70..7bcb39178e6bee 100644 --- a/examples/all-clusters-minimal-app/esp32/CMakeLists.txt +++ b/examples/all-clusters-minimal-app/esp32/CMakeLists.txt @@ -64,8 +64,4 @@ add_subdirectory(third_party/connectedhomeip/third_party/pigweed/repo) add_subdirectory(third_party/connectedhomeip/third_party/nanopb/repo) add_subdirectory(third_party/connectedhomeip/examples/platform/esp32/pw_sys_io) -get_target_property(_target_cxx_flags pw_build.cpp17 INTERFACE_COMPILE_OPTIONS) -list(REMOVE_ITEM _target_cxx_flags $<$:-std=c++17>) -list(APPEND _target_cxx_flags $<$:-std=gnu++17>) -set_target_properties(pw_build.cpp17 PROPERTIES INTERFACE_COMPILE_OPTIONS "${_target_cxx_flags}") endif(CONFIG_ENABLE_PW_RPC) diff --git a/examples/all-clusters-minimal-app/esp32/main/CMakeLists.txt b/examples/all-clusters-minimal-app/esp32/main/CMakeLists.txt index 376f85bc368378..31be1f41050a74 100644 --- a/examples/all-clusters-minimal-app/esp32/main/CMakeLists.txt +++ b/examples/all-clusters-minimal-app/esp32/main/CMakeLists.txt @@ -242,6 +242,7 @@ target_link_libraries(${COMPONENT_LIB} PUBLIC pw_hdlc pw_log pw_rpc.server + pw_sys_io pw_trace_tokenized pw_trace_tokenized.trace_buffer pw_trace_tokenized.rpc_service diff --git a/examples/all-clusters-minimal-app/infineon/psoc6/args.gni b/examples/all-clusters-minimal-app/infineon/psoc6/args.gni index ce7a2ab93e794d..54204a83fb9106 100644 --- a/examples/all-clusters-minimal-app/infineon/psoc6/args.gni +++ b/examples/all-clusters-minimal-app/infineon/psoc6/args.gni @@ -14,6 +14,7 @@ import("//build_overrides/chip.gni") import("//build_overrides/pigweed.gni") +import("${chip_root}/config/standalone/args.gni") import("${chip_root}/src/platform/Infineon/PSOC6/args.gni") psoc6_target_project = diff --git a/examples/all-clusters-minimal-app/tizen/.gn b/examples/all-clusters-minimal-app/tizen/.gn index c50b81609edec2..edd34d34bd13d2 100644 --- a/examples/all-clusters-minimal-app/tizen/.gn +++ b/examples/all-clusters-minimal-app/tizen/.gn @@ -22,5 +22,6 @@ check_system_includes = true default_args = { target_os = "tizen" + import("//args.gni") } diff --git a/examples/build_overrides/pigweed_environment.gni b/examples/build_overrides/pigweed_environment.gni index 1d72ca218fd0db..7fc8bb96532351 100644 --- a/examples/build_overrides/pigweed_environment.gni +++ b/examples/build_overrides/pigweed_environment.gni @@ -20,10 +20,11 @@ _bootstrap_root = "//third_party/connectedhomeip" import("${_bootstrap_root}/build_overrides/pigweed_environment.gni") # Rebase paths to our root. -dir_cipd_arm = get_path_info("${_bootstrap_root}/${dir_cipd_arm}", "abspath") -dir_cipd_pigweed = - get_path_info("${_bootstrap_root}/${dir_cipd_pigweed}", "abspath") -dir_cipd_python = - get_path_info("${_bootstrap_root}/${dir_cipd_python}", "abspath") -dir_virtual_env = +pw_env_setup_CIPD_ARM = + get_path_info("${_bootstrap_root}/${pw_env_setup_CIPD_ARM}", "abspath") +pw_env_setup_CIPD_PIGWEED = + get_path_info("${_bootstrap_root}/${pw_env_setup_CIPD_PIGWEED}", "abspath") +pw_env_setup_CIPD_PYTHON = + get_path_info("${_bootstrap_root}/${pw_env_setup_CIPD_PYTHON}", "abspath") +pw_env_setup_VIRTUAL_ENV = get_path_info("${_bootstrap_root}/${pw_env_setup_VIRTUAL_ENV}", "abspath") diff --git a/examples/chef/efr32/.gn b/examples/chef/efr32/.gn index 0ff42d50e06ef0..4c078f6acefdcc 100644 --- a/examples/chef/efr32/.gn +++ b/examples/chef/efr32/.gn @@ -24,5 +24,6 @@ default_args = { target_cpu = "arm" target_os = "freertos" chip_openthread_ftd = true + import("//args.gni") } diff --git a/examples/chef/efr32/args.gni b/examples/chef/efr32/args.gni index 4e322f1022501b..907b12f7064bb9 100644 --- a/examples/chef/efr32/args.gni +++ b/examples/chef/efr32/args.gni @@ -14,6 +14,7 @@ import("//build_overrides/chip.gni") import("//build_overrides/pigweed.gni") +import("${chip_root}/config/standalone/args.gni") import("${chip_root}/src/platform/EFR32/args.gni") efr32_sdk_target = get_label_info(":sdk", "label_no_toolchain") diff --git a/examples/chef/esp32/CMakeLists.txt b/examples/chef/esp32/CMakeLists.txt index 1bb4915047133b..e34fa66537aeda 100644 --- a/examples/chef/esp32/CMakeLists.txt +++ b/examples/chef/esp32/CMakeLists.txt @@ -80,8 +80,4 @@ add_subdirectory(third_party/connectedhomeip/third_party/pigweed/repo) add_subdirectory(third_party/connectedhomeip/third_party/nanopb/repo) add_subdirectory(third_party/connectedhomeip/examples/platform/esp32/pw_sys_io) -get_target_property(_target_cxx_flags pw_build.cpp17 INTERFACE_COMPILE_OPTIONS) -list(REMOVE_ITEM _target_cxx_flags $<$:-std=c++17>) -list(APPEND _target_cxx_flags $<$:-std=gnu++17>) -set_target_properties(pw_build.cpp17 PROPERTIES INTERFACE_COMPILE_OPTIONS "${_target_cxx_flags}") endif(CONFIG_ENABLE_PW_RPC) diff --git a/examples/chef/esp32/main/CMakeLists.txt b/examples/chef/esp32/main/CMakeLists.txt index 2f02250d10ab76..777c891486b380 100644 --- a/examples/chef/esp32/main/CMakeLists.txt +++ b/examples/chef/esp32/main/CMakeLists.txt @@ -193,6 +193,7 @@ target_link_libraries(${COMPONENT_LIB} PUBLIC pw_hdlc pw_log pw_rpc.server + pw_sys_io pw_trace_tokenized pw_trace_tokenized.trace_buffer pw_trace_tokenized.rpc_service diff --git a/examples/chef/linux/BUILD.gn b/examples/chef/linux/BUILD.gn index bef04eab320ea5..f8463376b6ba15 100644 --- a/examples/chef/linux/BUILD.gn +++ b/examples/chef/linux/BUILD.gn @@ -12,8 +12,10 @@ # See the License for the specific language governing permissions and # limitations under the License. +import("//build_overrides/build.gni") import("//build_overrides/chip.gni") +import("${build_root}/config/compiler/compiler.gni") import("${chip_root}/build/chip/tools.gni") import("${chip_root}/src/app/chip_data_model.gni") import("${chip_root}/src/app/common_flags.gni") @@ -92,7 +94,10 @@ executable("${sample_name}") { deps += pw_build_LINK_DEPS - cflags = [ "-Wno-gnu-designator" ] + cflags = [] + if (is_clang) { + cflags += [ "-Wno-gnu-designator" ] + } include_dirs += [ "${chip_root}/examples/common" ] } else { diff --git a/examples/chef/linux/with_pw_rpc.gni b/examples/chef/linux/with_pw_rpc.gni index 756a93469bf072..416733753a8909 100644 --- a/examples/chef/linux/with_pw_rpc.gni +++ b/examples/chef/linux/with_pw_rpc.gni @@ -32,7 +32,6 @@ pw_rpc_system_server_BACKEND = "${chip_root}/config/linux/lib/pw_rpc:pw_rpc" dir_pw_third_party_nanopb = "${chip_root}/third_party/nanopb/repo" pw_chrono_SYSTEM_CLOCK_BACKEND = "$dir_pw_chrono_stl:system_clock" pw_sync_MUTEX_BACKEND = "$dir_pw_sync_stl:mutex_backend" -pw_span_ENABLE_STD_SPAN_POLYFILL = false pw_build_LINK_DEPS = [ "$dir_pw_assert:impl", diff --git a/examples/chef/nrfconnect/CMakeLists.txt b/examples/chef/nrfconnect/CMakeLists.txt index ecd4ae171079e3..408b079921e6bf 100644 --- a/examples/chef/nrfconnect/CMakeLists.txt +++ b/examples/chef/nrfconnect/CMakeLists.txt @@ -117,7 +117,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) @@ -209,7 +208,6 @@ target_compile_options(app PRIVATE "-DPW_RPC_DESCRIPTOR_SERVICE=1" "-DPW_RPC_DEVICE_SERVICE=1" "-DPW_RPC_THREAD_SERVICE=1" - "-DPW_RPC_TRACING_SERVICE=1" ) target_link_libraries(app PRIVATE @@ -219,17 +217,10 @@ target_link_libraries(app PRIVATE thread_service.nanopb_rpc pw_checksum pw_hdlc + pw_hdlc.pw_rpc pw_log pw_rpc.server - 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" + pw_sys_io ) endif(CONFIG_ENABLE_PW_RPC) diff --git a/examples/common/pigweed/RpcService.cpp b/examples/common/pigweed/RpcService.cpp index a60827236f6299..0b049c0b2ab8cc 100644 --- a/examples/common/pigweed/RpcService.cpp +++ b/examples/common/pigweed/RpcService.cpp @@ -116,7 +116,7 @@ void Start(void (*RegisterServices)(pw::rpc::Server &), ::chip::rpc::Mutex * uar std::array input_buffer; Logging::Log(Logging::kLogModule_NotSpecified, Logging::kLogCategory_Detail, "Starting pw_rpc server"); - pw::hdlc::ReadAndProcessPackets(server, hdlc_channel_output, input_buffer); + pw::hdlc::ReadAndProcessPackets(server, input_buffer); } } // namespace rpc diff --git a/examples/common/pigweed/rpc_console/BUILD.gn b/examples/common/pigweed/rpc_console/BUILD.gn index 3a609b75e4484a..2976f5688d7445 100644 --- a/examples/common/pigweed/rpc_console/BUILD.gn +++ b/examples/common/pigweed/rpc_console/BUILD.gn @@ -29,7 +29,7 @@ group("default") { # in: # out/obj/chip_rpc_distribution/ <- source files here # out/obj/chip_rpc_distribution._build_wheel/chip_rpc-0.0.1-py3-none-any.whl -pw_create_python_source_tree("chip_rpc_distribution") { +pw_python_distribution("chip_rpc_distribution") { packages = [ "py:chip_rpc" ] generate_setup_cfg = { common_config_file = "common_setup.cfg" diff --git a/examples/common/pigweed/system_rpc_server.cc b/examples/common/pigweed/system_rpc_server.cc index 25097eb16ea124..6778499c54ab3c 100644 --- a/examples/common/pigweed/system_rpc_server.cc +++ b/examples/common/pigweed/system_rpc_server.cc @@ -70,7 +70,7 @@ Status Start() hdlc::Frame & frame = result.value(); if (frame.address() == hdlc::kDefaultRpcAddress) { - server.ProcessPacket(frame.data(), hdlc_channel_output); + server.ProcessPacket(frame.data()); } } } diff --git a/examples/contact-sensor-app/nxp/k32w/k32w0/args.gni b/examples/contact-sensor-app/nxp/k32w/k32w0/args.gni index 5f4766d8429e64..4f4bba4b47cf07 100644 --- a/examples/contact-sensor-app/nxp/k32w/k32w0/args.gni +++ b/examples/contact-sensor-app/nxp/k32w/k32w0/args.gni @@ -13,6 +13,7 @@ # limitations under the License. import("//build_overrides/chip.gni") +import("${chip_root}/config/standalone/args.gni") import("${chip_root}/examples/platform/nxp/k32w/k32w0/args.gni") # SDK target. This is overridden to add our SDK app_config.h & defines. diff --git a/examples/darwin-framework-tool/.gn b/examples/darwin-framework-tool/.gn index 00e402644d1877..d7b777f8ea374b 100644 --- a/examples/darwin-framework-tool/.gn +++ b/examples/darwin-framework-tool/.gn @@ -22,6 +22,5 @@ check_system_includes = true default_args = { import("//args.gni") - chip_disable_platform_kvs = true } diff --git a/examples/dynamic-bridge-app/linux/with_pw_rpc.gni b/examples/dynamic-bridge-app/linux/with_pw_rpc.gni index 756a93469bf072..416733753a8909 100644 --- a/examples/dynamic-bridge-app/linux/with_pw_rpc.gni +++ b/examples/dynamic-bridge-app/linux/with_pw_rpc.gni @@ -32,7 +32,6 @@ pw_rpc_system_server_BACKEND = "${chip_root}/config/linux/lib/pw_rpc:pw_rpc" dir_pw_third_party_nanopb = "${chip_root}/third_party/nanopb/repo" pw_chrono_SYSTEM_CLOCK_BACKEND = "$dir_pw_chrono_stl:system_clock" pw_sync_MUTEX_BACKEND = "$dir_pw_sync_stl:mutex_backend" -pw_span_ENABLE_STD_SPAN_POLYFILL = false pw_build_LINK_DEPS = [ "$dir_pw_assert:impl", diff --git a/examples/light-switch-app/ameba/chip_main.cmake b/examples/light-switch-app/ameba/chip_main.cmake index 33058ac2d49e75..3306cbf5233559 100755 --- a/examples/light-switch-app/ameba/chip_main.cmake +++ b/examples/light-switch-app/ameba/chip_main.cmake @@ -225,6 +225,7 @@ target_link_libraries(${chip_main} PUBLIC pw_hdlc pw_log pw_rpc.server + pw_sys_io pw_trace_tokenized pw_trace_tokenized.trace_buffer pw_trace_tokenized.rpc_service diff --git a/examples/light-switch-app/efr32/.gn b/examples/light-switch-app/efr32/.gn index 0ff42d50e06ef0..4c078f6acefdcc 100644 --- a/examples/light-switch-app/efr32/.gn +++ b/examples/light-switch-app/efr32/.gn @@ -24,5 +24,6 @@ default_args = { target_cpu = "arm" target_os = "freertos" chip_openthread_ftd = true + import("//args.gni") } diff --git a/examples/light-switch-app/efr32/args.gni b/examples/light-switch-app/efr32/args.gni index 8e1885d95d18d4..752701e73aab63 100644 --- a/examples/light-switch-app/efr32/args.gni +++ b/examples/light-switch-app/efr32/args.gni @@ -14,6 +14,7 @@ import("//build_overrides/chip.gni") import("//build_overrides/pigweed.gni") +import("${chip_root}/config/standalone/args.gni") import("${chip_root}/src/platform/EFR32/args.gni") efr32_sdk_target = get_label_info(":sdk", "label_no_toolchain") diff --git a/examples/lighting-app/ameba/chip_main.cmake b/examples/lighting-app/ameba/chip_main.cmake index b8120c6be407e4..816fd869819fc5 100755 --- a/examples/lighting-app/ameba/chip_main.cmake +++ b/examples/lighting-app/ameba/chip_main.cmake @@ -220,6 +220,7 @@ target_link_libraries(${chip_main} PUBLIC pw_hdlc pw_log pw_rpc.server + pw_sys_io pw_trace_tokenized pw_trace_tokenized.trace_buffer pw_trace_tokenized.rpc_service diff --git a/examples/lighting-app/beken/args.gni b/examples/lighting-app/beken/args.gni index 4dc3ac97f7054d..79a52c9890eaca 100755 --- a/examples/lighting-app/beken/args.gni +++ b/examples/lighting-app/beken/args.gni @@ -16,6 +16,7 @@ # options are used from examples/. import("//build_overrides/chip.gni") +import("${chip_root}/config/standalone/args.gni") chip_device_platform = "beken" diff --git a/examples/lighting-app/bouffalolab/bl602/args.gni b/examples/lighting-app/bouffalolab/bl602/args.gni index 0a6bd075d61e15..464b0c63ff827c 100644 --- a/examples/lighting-app/bouffalolab/bl602/args.gni +++ b/examples/lighting-app/bouffalolab/bl602/args.gni @@ -14,6 +14,7 @@ import("//build_overrides/chip.gni") import("//build_overrides/pigweed.gni") +import("${chip_root}/config/standalone/args.gni") import("${chip_root}/src/platform/bouffalolab/BL602/args.gni") bl602_sdk_target = get_label_info(":sdk", "label_no_toolchain") @@ -24,3 +25,8 @@ pw_rpc_CONFIG = "$dir_pw_rpc:disable_global_mutex" chip_enable_ota_requestor = true chip_detail_logging = false + +pw_build_LINK_DEPS = [ + "$dir_pw_assert:impl", + "$dir_pw_log:impl", +] diff --git a/examples/lighting-app/bouffalolab/bl702/args.gni b/examples/lighting-app/bouffalolab/bl702/args.gni index 501f427507548d..ecfb7424c6d2e6 100644 --- a/examples/lighting-app/bouffalolab/bl702/args.gni +++ b/examples/lighting-app/bouffalolab/bl702/args.gni @@ -14,6 +14,7 @@ import("//build_overrides/chip.gni") import("//build_overrides/pigweed.gni") +import("${chip_root}/config/standalone/args.gni") import("${chip_root}/src/platform/bouffalolab/BL702/args.gni") bl702_sdk_target = get_label_info(":sdk", "label_no_toolchain") diff --git a/examples/lighting-app/efr32/.gn b/examples/lighting-app/efr32/.gn index 0ff42d50e06ef0..4c078f6acefdcc 100644 --- a/examples/lighting-app/efr32/.gn +++ b/examples/lighting-app/efr32/.gn @@ -24,5 +24,6 @@ default_args = { target_cpu = "arm" target_os = "freertos" chip_openthread_ftd = true + import("//args.gni") } diff --git a/examples/lighting-app/efr32/args.gni b/examples/lighting-app/efr32/args.gni index 1e5ed4ca14102c..7f4a06e57d9a59 100644 --- a/examples/lighting-app/efr32/args.gni +++ b/examples/lighting-app/efr32/args.gni @@ -14,6 +14,7 @@ import("//build_overrides/chip.gni") import("//build_overrides/pigweed.gni") +import("${chip_root}/config/standalone/args.gni") import("${chip_root}/src/platform/EFR32/args.gni") efr32_sdk_target = get_label_info(":sdk", "label_no_toolchain") diff --git a/examples/lighting-app/esp32/CMakeLists.txt b/examples/lighting-app/esp32/CMakeLists.txt index 30d1000b51b198..b865807ad8e076 100644 --- a/examples/lighting-app/esp32/CMakeLists.txt +++ b/examples/lighting-app/esp32/CMakeLists.txt @@ -66,8 +66,8 @@ add_subdirectory(third_party/connectedhomeip/third_party/pigweed/repo) add_subdirectory(third_party/connectedhomeip/third_party/nanopb/repo) add_subdirectory(third_party/connectedhomeip/examples/platform/esp32/pw_sys_io) -get_target_property(_target_cxx_flags pw_build.cpp17 INTERFACE_COMPILE_OPTIONS) +get_target_property(_target_cxx_flags pw_build.cpp17._public_config INTERFACE_COMPILE_OPTIONS) list(REMOVE_ITEM _target_cxx_flags $<$:-std=c++17>) list(APPEND _target_cxx_flags $<$:-std=gnu++17>) -set_target_properties(pw_build.cpp17 PROPERTIES INTERFACE_COMPILE_OPTIONS "${_target_cxx_flags}") +set_target_properties(pw_build.cpp17._public_config PROPERTIES INTERFACE_COMPILE_OPTIONS "${_target_cxx_flags}") endif(CONFIG_ENABLE_PW_RPC) diff --git a/examples/lighting-app/esp32/main/CMakeLists.txt b/examples/lighting-app/esp32/main/CMakeLists.txt index 61953e1c2a0d34..f7517c62295e8a 100644 --- a/examples/lighting-app/esp32/main/CMakeLists.txt +++ b/examples/lighting-app/esp32/main/CMakeLists.txt @@ -207,6 +207,7 @@ target_link_libraries(${COMPONENT_LIB} PUBLIC pw_hdlc pw_log pw_rpc.server + pw_sys_io pw_trace_tokenized pw_trace_tokenized.trace_buffer pw_trace_tokenized.rpc_service diff --git a/examples/lighting-app/genio/.gn b/examples/lighting-app/genio/.gn index 0adefc6ff99c6a..3d48789e30ab3d 100644 --- a/examples/lighting-app/genio/.gn +++ b/examples/lighting-app/genio/.gn @@ -23,5 +23,6 @@ check_system_includes = true default_args = { target_cpu = "arm" target_os = "freertos" + import("//args.gni") } diff --git a/examples/lighting-app/genio/args.gni b/examples/lighting-app/genio/args.gni index ddbfb9fa47f20d..e22869653722a7 100644 --- a/examples/lighting-app/genio/args.gni +++ b/examples/lighting-app/genio/args.gni @@ -14,6 +14,7 @@ import("//build_overrides/chip.gni") import("//build_overrides/pigweed.gni") +import("${chip_root}/config/standalone/args.gni") import("${chip_root}/src/platform/mt793x/args.gni") mt793x_sdk_target = get_label_info(":sdk", "label_no_toolchain") diff --git a/examples/lighting-app/infineon/cyw30739/args.gni b/examples/lighting-app/infineon/cyw30739/args.gni index ff653ee769356a..b8aeb760b79fb6 100644 --- a/examples/lighting-app/infineon/cyw30739/args.gni +++ b/examples/lighting-app/infineon/cyw30739/args.gni @@ -13,6 +13,7 @@ # limitations under the License. import("//build_overrides/chip.gni") +import("${chip_root}/config/standalone/args.gni") import("${chip_root}/src/platform/Infineon/CYW30739/args.gni") cyw30739_sdk_target = get_label_info(":sdk", "label_no_toolchain") diff --git a/examples/lighting-app/infineon/psoc6/args.gni b/examples/lighting-app/infineon/psoc6/args.gni index 9ca701ab363c9f..f9812d7a37aff3 100644 --- a/examples/lighting-app/infineon/psoc6/args.gni +++ b/examples/lighting-app/infineon/psoc6/args.gni @@ -14,6 +14,7 @@ import("//build_overrides/chip.gni") import("//build_overrides/pigweed.gni") +import("${chip_root}/config/standalone/args.gni") import("${chip_root}/src/platform/Infineon/PSOC6/args.gni") psoc6_target_project = diff --git a/examples/lighting-app/linux/with_pw_rpc.gni b/examples/lighting-app/linux/with_pw_rpc.gni index 756a93469bf072..416733753a8909 100644 --- a/examples/lighting-app/linux/with_pw_rpc.gni +++ b/examples/lighting-app/linux/with_pw_rpc.gni @@ -32,7 +32,6 @@ pw_rpc_system_server_BACKEND = "${chip_root}/config/linux/lib/pw_rpc:pw_rpc" dir_pw_third_party_nanopb = "${chip_root}/third_party/nanopb/repo" pw_chrono_SYSTEM_CLOCK_BACKEND = "$dir_pw_chrono_stl:system_clock" pw_sync_MUTEX_BACKEND = "$dir_pw_sync_stl:mutex_backend" -pw_span_ENABLE_STD_SPAN_POLYFILL = false pw_build_LINK_DEPS = [ "$dir_pw_assert:impl", diff --git a/examples/lighting-app/nrfconnect/CMakeLists.txt b/examples/lighting-app/nrfconnect/CMakeLists.txt index 8de4481f42d5f9..a39de10f28bc48 100644 --- a/examples/lighting-app/nrfconnect/CMakeLists.txt +++ b/examples/lighting-app/nrfconnect/CMakeLists.txt @@ -223,6 +223,7 @@ target_link_libraries(app PRIVATE pw_hdlc pw_log pw_rpc.server + pw_sys_io pw_trace_tokenized pw_trace_tokenized.trace_buffer pw_trace_tokenized.rpc_service diff --git a/examples/lighting-app/nxp/k32w/k32w0/args.gni b/examples/lighting-app/nxp/k32w/k32w0/args.gni index 5f4766d8429e64..4f4bba4b47cf07 100644 --- a/examples/lighting-app/nxp/k32w/k32w0/args.gni +++ b/examples/lighting-app/nxp/k32w/k32w0/args.gni @@ -13,6 +13,7 @@ # limitations under the License. import("//build_overrides/chip.gni") +import("${chip_root}/config/standalone/args.gni") import("${chip_root}/examples/platform/nxp/k32w/k32w0/args.gni") # SDK target. This is overridden to add our SDK app_config.h & defines. diff --git a/examples/lighting-app/qpg/args.gni b/examples/lighting-app/qpg/args.gni index 3e533b2a6f1751..053b2c0695b791 100644 --- a/examples/lighting-app/qpg/args.gni +++ b/examples/lighting-app/qpg/args.gni @@ -14,6 +14,7 @@ import("//build_overrides/chip.gni") import("//build_overrides/pigweed.gni") +import("${chip_root}/config/standalone/args.gni") import("${chip_root}/examples/platform/qpg/args.gni") qpg_sdk_target = get_label_info(":sdk", "label_no_toolchain") diff --git a/examples/lighting-app/tizen/.gn b/examples/lighting-app/tizen/.gn index c50b81609edec2..edd34d34bd13d2 100644 --- a/examples/lighting-app/tizen/.gn +++ b/examples/lighting-app/tizen/.gn @@ -22,5 +22,6 @@ check_system_includes = true default_args = { target_os = "tizen" + import("//args.gni") } diff --git a/examples/lock-app/cc13x2x7_26x2x7/args.gni b/examples/lock-app/cc13x2x7_26x2x7/args.gni index c93d04bc8901e0..58a0bbbf2f366b 100644 --- a/examples/lock-app/cc13x2x7_26x2x7/args.gni +++ b/examples/lock-app/cc13x2x7_26x2x7/args.gni @@ -13,6 +13,7 @@ # limitations under the License. import("//build_overrides/chip.gni") +import("${chip_root}/config/standalone/args.gni") import("${chip_root}/examples/platform/cc13x2_26x2/args.gni") ti_simplelink_sdk_target = get_label_info(":sdk", "label_no_toolchain") diff --git a/examples/lock-app/cc32xx/args.gni b/examples/lock-app/cc32xx/args.gni index 8d5afa600c2067..aaf39441ba3490 100755 --- a/examples/lock-app/cc32xx/args.gni +++ b/examples/lock-app/cc32xx/args.gni @@ -13,6 +13,7 @@ # limitations under the License. import("//build_overrides/chip.gni") +import("${chip_root}/config/standalone/args.gni") import("${chip_root}/examples/platform/cc32xx/args.gni") ti_simplelink_sdk_target = get_label_info(":sdk", "label_no_toolchain") diff --git a/examples/lock-app/efr32/.gn b/examples/lock-app/efr32/.gn index 0ff42d50e06ef0..4c078f6acefdcc 100644 --- a/examples/lock-app/efr32/.gn +++ b/examples/lock-app/efr32/.gn @@ -24,5 +24,6 @@ default_args = { target_cpu = "arm" target_os = "freertos" chip_openthread_ftd = true + import("//args.gni") } diff --git a/examples/lock-app/efr32/args.gni b/examples/lock-app/efr32/args.gni index 9ff5e1fd3992f1..02ac44a44ac925 100644 --- a/examples/lock-app/efr32/args.gni +++ b/examples/lock-app/efr32/args.gni @@ -14,6 +14,7 @@ import("//build_overrides/chip.gni") import("//build_overrides/pigweed.gni") +import("${chip_root}/config/standalone/args.gni") import("${chip_root}/src/platform/EFR32/args.gni") efr32_sdk_target = get_label_info(":sdk", "label_no_toolchain") diff --git a/examples/lock-app/esp32/CMakeLists.txt b/examples/lock-app/esp32/CMakeLists.txt index 0c557571f36513..9cc498c3c6863a 100644 --- a/examples/lock-app/esp32/CMakeLists.txt +++ b/examples/lock-app/esp32/CMakeLists.txt @@ -57,10 +57,10 @@ add_subdirectory(third_party/connectedhomeip/third_party/pigweed/repo) add_subdirectory(third_party/connectedhomeip/third_party/nanopb/repo) add_subdirectory(third_party/connectedhomeip/examples/platform/esp32/pw_sys_io) -get_target_property(_target_cxx_flags pw_build.cpp17 INTERFACE_COMPILE_OPTIONS) +get_target_property(_target_cxx_flags pw_build.cpp17._public_config INTERFACE_COMPILE_OPTIONS) list(REMOVE_ITEM _target_cxx_flags $<$:-std=c++17>) list(APPEND _target_cxx_flags $<$:-std=gnu++17>) -set_target_properties(pw_build.cpp17 PROPERTIES INTERFACE_COMPILE_OPTIONS "${_target_cxx_flags}") +set_target_properties(pw_build.cpp17._public_config PROPERTIES INTERFACE_COMPILE_OPTIONS "${_target_cxx_flags}") endif(CONFIG_ENABLE_PW_RPC) flashing_script() diff --git a/examples/lock-app/esp32/main/CMakeLists.txt b/examples/lock-app/esp32/main/CMakeLists.txt index eee6f6926d5d32..2ba9539afdbf5f 100644 --- a/examples/lock-app/esp32/main/CMakeLists.txt +++ b/examples/lock-app/esp32/main/CMakeLists.txt @@ -132,6 +132,7 @@ target_link_libraries(${COMPONENT_LIB} PUBLIC pw_hdlc pw_log pw_rpc.server + pw_sys_io ) target_compile_options(${COMPONENT_LIB} PRIVATE diff --git a/examples/lock-app/infineon/cyw30739/args.gni b/examples/lock-app/infineon/cyw30739/args.gni index ff653ee769356a..b8aeb760b79fb6 100644 --- a/examples/lock-app/infineon/cyw30739/args.gni +++ b/examples/lock-app/infineon/cyw30739/args.gni @@ -13,6 +13,7 @@ # limitations under the License. import("//build_overrides/chip.gni") +import("${chip_root}/config/standalone/args.gni") import("${chip_root}/src/platform/Infineon/CYW30739/args.gni") cyw30739_sdk_target = get_label_info(":sdk", "label_no_toolchain") diff --git a/examples/lock-app/infineon/psoc6/args.gni b/examples/lock-app/infineon/psoc6/args.gni index 62bdc6d3f6908c..b65d0d8885e25d 100644 --- a/examples/lock-app/infineon/psoc6/args.gni +++ b/examples/lock-app/infineon/psoc6/args.gni @@ -14,6 +14,7 @@ import("//build_overrides/chip.gni") import("//build_overrides/pigweed.gni") +import("${chip_root}/config/standalone/args.gni") import("${chip_root}/src/platform/Infineon/PSOC6/args.gni") psoc6_target_project = diff --git a/examples/lock-app/nxp/k32w/k32w0/args.gni b/examples/lock-app/nxp/k32w/k32w0/args.gni index 2ace8356337891..dd8543b45f9f8f 100644 --- a/examples/lock-app/nxp/k32w/k32w0/args.gni +++ b/examples/lock-app/nxp/k32w/k32w0/args.gni @@ -13,6 +13,7 @@ # limitations under the License. import("//build_overrides/chip.gni") +import("${chip_root}/config/standalone/args.gni") import("${chip_root}/examples/platform/nxp/k32w/k32w0/args.gni") # SDK target. This is overridden to add our SDK app_config.h & defines. diff --git a/examples/lock-app/qpg/args.gni b/examples/lock-app/qpg/args.gni index 26f7455d068eda..065c9f07dc848a 100644 --- a/examples/lock-app/qpg/args.gni +++ b/examples/lock-app/qpg/args.gni @@ -14,6 +14,7 @@ import("//build_overrides/chip.gni") import("//build_overrides/pigweed.gni") +import("${chip_root}/config/standalone/args.gni") import("${chip_root}/examples/platform/qpg/args.gni") qpg_sdk_target = get_label_info(":sdk", "label_no_toolchain") diff --git a/examples/ota-requestor-app/esp32/CMakeLists.txt b/examples/ota-requestor-app/esp32/CMakeLists.txt index ca79dd4561b1aa..6d522a07c7d1fd 100644 --- a/examples/ota-requestor-app/esp32/CMakeLists.txt +++ b/examples/ota-requestor-app/esp32/CMakeLists.txt @@ -57,10 +57,10 @@ add_subdirectory(third_party/connectedhomeip/third_party/pigweed/repo) add_subdirectory(third_party/connectedhomeip/third_party/nanopb/repo) add_subdirectory(third_party/connectedhomeip/examples/platform/esp32/pw_sys_io) -get_target_property(_target_cxx_flags pw_build.cpp17 INTERFACE_COMPILE_OPTIONS) +get_target_property(_target_cxx_flags pw_build.cpp17._public_config INTERFACE_COMPILE_OPTIONS) list(REMOVE_ITEM _target_cxx_flags $<$:-std=c++17>) list(APPEND _target_cxx_flags $<$:-std=gnu++17>) -set_target_properties(pw_build.cpp17 PROPERTIES INTERFACE_COMPILE_OPTIONS "${_target_cxx_flags}") +set_target_properties(pw_build.cpp17._public_config PROPERTIES INTERFACE_COMPILE_OPTIONS "${_target_cxx_flags}") endif(CONFIG_ENABLE_PW_RPC) diff --git a/examples/ota-requestor-app/esp32/main/CMakeLists.txt b/examples/ota-requestor-app/esp32/main/CMakeLists.txt index a0633511cfaded..184e29acd10a32 100644 --- a/examples/ota-requestor-app/esp32/main/CMakeLists.txt +++ b/examples/ota-requestor-app/esp32/main/CMakeLists.txt @@ -176,6 +176,7 @@ target_link_libraries(${COMPONENT_LIB} PUBLIC pw_hdlc pw_log pw_rpc.server + pw_sys_io pw_trace_tokenized pw_trace_tokenized.trace_buffer pw_trace_tokenized.rpc_service diff --git a/examples/ota-requestor-app/infineon/cyw30739/args.gni b/examples/ota-requestor-app/infineon/cyw30739/args.gni index 67d2b05e5e1845..e6ec7f5d3636a6 100644 --- a/examples/ota-requestor-app/infineon/cyw30739/args.gni +++ b/examples/ota-requestor-app/infineon/cyw30739/args.gni @@ -13,6 +13,7 @@ # limitations under the License. import("//build_overrides/chip.gni") +import("${chip_root}/config/standalone/args.gni") import("${chip_root}/src/platform/Infineon/CYW30739/args.gni") cyw30739_sdk_target = get_label_info(":sdk", "label_no_toolchain") diff --git a/examples/persistent-storage/cc13x2x7_26x2x7/args.gni b/examples/persistent-storage/cc13x2x7_26x2x7/args.gni index c35354a5f43732..ad8a3f88326649 100644 --- a/examples/persistent-storage/cc13x2x7_26x2x7/args.gni +++ b/examples/persistent-storage/cc13x2x7_26x2x7/args.gni @@ -13,6 +13,7 @@ # limitations under the License. import("//build_overrides/chip.gni") +import("${chip_root}/config/standalone/args.gni") import("${chip_root}/examples/platform/cc13x2_26x2/args.gni") ti_simplelink_sdk_target = get_label_info(":sdk", "label_no_toolchain") diff --git a/examples/persistent-storage/efr32/args.gni b/examples/persistent-storage/efr32/args.gni index 9c2f04d2324347..312d2eadede066 100644 --- a/examples/persistent-storage/efr32/args.gni +++ b/examples/persistent-storage/efr32/args.gni @@ -14,6 +14,7 @@ import("//build_overrides/chip.gni") import("//build_overrides/pigweed.gni") +import("${chip_root}/config/standalone/args.gni") import("${chip_root}/src/platform/EFR32/args.gni") efr32_sdk_target = get_label_info(":sdk", "label_no_toolchain") diff --git a/examples/persistent-storage/infineon/psoc6/args.gni b/examples/persistent-storage/infineon/psoc6/args.gni index 0b4443ebd96fcc..b8727e924b2b09 100644 --- a/examples/persistent-storage/infineon/psoc6/args.gni +++ b/examples/persistent-storage/infineon/psoc6/args.gni @@ -14,6 +14,7 @@ import("//build_overrides/chip.gni") import("//build_overrides/pigweed.gni") +import("${chip_root}/config/standalone/args.gni") import("${chip_root}/src/platform/Infineon/PSOC6/args.gni") psoc6_target_project = diff --git a/examples/persistent-storage/qpg/args.gni b/examples/persistent-storage/qpg/args.gni index 68e1d67d9f4230..15224d9d251fe5 100644 --- a/examples/persistent-storage/qpg/args.gni +++ b/examples/persistent-storage/qpg/args.gni @@ -14,6 +14,7 @@ import("//build_overrides/chip.gni") +import("${chip_root}/config/standalone/args.gni") import("${chip_root}/examples/platform/qpg/args.gni") qpg_sdk_target = get_label_info(":sdk", "label_no_toolchain") chip_enable_openthread = false diff --git a/examples/pigweed-app/ameba/chip_main.cmake b/examples/pigweed-app/ameba/chip_main.cmake index 77e63b672d5e35..be170a675fb84a 100644 --- a/examples/pigweed-app/ameba/chip_main.cmake +++ b/examples/pigweed-app/ameba/chip_main.cmake @@ -64,6 +64,7 @@ target_link_libraries(${chip_main} PUBLIC pw_log pw_rpc.nanopb.echo_service pw_rpc.server + pw_sys_io PwRpc ) diff --git a/examples/pigweed-app/efr32/args.gni b/examples/pigweed-app/efr32/args.gni index eb9d28234cc6eb..b42ad9267d0134 100644 --- a/examples/pigweed-app/efr32/args.gni +++ b/examples/pigweed-app/efr32/args.gni @@ -14,6 +14,7 @@ import("//build_overrides/chip.gni") import("${chip_root}/config/efr32/lib/pw_rpc/pw_rpc.gni") +import("${chip_root}/config/standalone/args.gni") import("${chip_root}/src/platform/EFR32/args.gni") efr32_sdk_target = get_label_info(":sdk", "label_no_toolchain") diff --git a/examples/pigweed-app/esp32/CMakeLists.txt b/examples/pigweed-app/esp32/CMakeLists.txt index fd8c1787569120..81aa021ac5d815 100644 --- a/examples/pigweed-app/esp32/CMakeLists.txt +++ b/examples/pigweed-app/esp32/CMakeLists.txt @@ -58,9 +58,9 @@ add_subdirectory(third_party/connectedhomeip/third_party/pigweed/repo) add_subdirectory(third_party/connectedhomeip/third_party/nanopb/repo) add_subdirectory(third_party/connectedhomeip/examples/platform/esp32/pw_sys_io) -get_target_property(_target_cxx_flags pw_build.cpp17 INTERFACE_COMPILE_OPTIONS) +get_target_property(_target_cxx_flags pw_build.cpp17._public_config INTERFACE_COMPILE_OPTIONS) list(REMOVE_ITEM _target_cxx_flags $<$:-std=c++17>) list(APPEND _target_cxx_flags $<$:-std=gnu++17>) -set_target_properties(pw_build.cpp17 PROPERTIES INTERFACE_COMPILE_OPTIONS "${_target_cxx_flags}") +set_target_properties(pw_build.cpp17._public_config PROPERTIES INTERFACE_COMPILE_OPTIONS "${_target_cxx_flags}") flashing_script(DEPENDS "${CMAKE_CURRENT_LIST_DIR}/echo_test_config.yml" "${CMAKE_CURRENT_LIST_DIR}/third_party/connectedhomeip/examples/pigweed-app/mobly_tests/echo_test.py") diff --git a/examples/pigweed-app/esp32/main/CMakeLists.txt b/examples/pigweed-app/esp32/main/CMakeLists.txt index c23dfe3a8de84c..005f587b70b50c 100644 --- a/examples/pigweed-app/esp32/main/CMakeLists.txt +++ b/examples/pigweed-app/esp32/main/CMakeLists.txt @@ -43,4 +43,5 @@ target_link_libraries(${COMPONENT_LIB} PUBLIC pw_log pw_rpc.nanopb.echo_service pw_rpc.server + pw_sys_io ) diff --git a/examples/pigweed-app/nrfconnect/CMakeLists.txt b/examples/pigweed-app/nrfconnect/CMakeLists.txt index 90d53ea9ad0d38..183e929f2bdc80 100644 --- a/examples/pigweed-app/nrfconnect/CMakeLists.txt +++ b/examples/pigweed-app/nrfconnect/CMakeLists.txt @@ -87,9 +87,11 @@ target_sources(app PRIVATE main/main.cpp target_link_libraries(app PUBLIC pw_checksum pw_hdlc + pw_hdlc.pw_rpc pw_log pw_rpc.nanopb.echo_service pw_rpc.server + pw_sys_io ) # Workaround cyclic dependency between nrf_security libraries) diff --git a/examples/platform/linux/system_rpc_server.cc b/examples/platform/linux/system_rpc_server.cc index d9822a7110d9cc..dee4bb6d7d957e 100644 --- a/examples/platform/linux/system_rpc_server.cc +++ b/examples/platform/linux/system_rpc_server.cc @@ -110,7 +110,7 @@ Status Start() continue; } - server.ProcessPacket(frame.data(), hdlc_channel_output).IgnoreError(); + server.ProcessPacket(frame.data()).IgnoreError(); } } } diff --git a/examples/pump-app/cc13x2x7_26x2x7/args.gni b/examples/pump-app/cc13x2x7_26x2x7/args.gni index 165cee6998698e..8baf8977c88bb2 100644 --- a/examples/pump-app/cc13x2x7_26x2x7/args.gni +++ b/examples/pump-app/cc13x2x7_26x2x7/args.gni @@ -13,6 +13,7 @@ # limitations under the License. import("//build_overrides/chip.gni") +import("${chip_root}/config/standalone/args.gni") import("${chip_root}/examples/platform/cc13x2_26x2/args.gni") ti_simplelink_sdk_target = get_label_info(":sdk", "label_no_toolchain") diff --git a/examples/pump-controller-app/cc13x2x7_26x2x7/args.gni b/examples/pump-controller-app/cc13x2x7_26x2x7/args.gni index 5b9366d218222b..7d386dc216df2f 100644 --- a/examples/pump-controller-app/cc13x2x7_26x2x7/args.gni +++ b/examples/pump-controller-app/cc13x2x7_26x2x7/args.gni @@ -13,6 +13,7 @@ # limitations under the License. import("//build_overrides/chip.gni") +import("${chip_root}/config/standalone/args.gni") import("${chip_root}/examples/platform/cc13x2_26x2/args.gni") ti_simplelink_sdk_target = get_label_info(":sdk", "label_no_toolchain") diff --git a/examples/shell/cc13x2x7_26x2x7/args.gni b/examples/shell/cc13x2x7_26x2x7/args.gni index 2966155edeb06a..58ec5edf1dbb5a 100644 --- a/examples/shell/cc13x2x7_26x2x7/args.gni +++ b/examples/shell/cc13x2x7_26x2x7/args.gni @@ -13,6 +13,7 @@ # limitations under the License. import("//build_overrides/chip.gni") +import("${chip_root}/config/standalone/args.gni") import("${chip_root}/examples/platform/cc13x2_26x2/args.gni") ti_simplelink_sdk_target = get_label_info(":sdk", "label_no_toolchain") diff --git a/examples/shell/efr32/args.gni b/examples/shell/efr32/args.gni index a80bfb32a7e784..5807e23caa6c57 100644 --- a/examples/shell/efr32/args.gni +++ b/examples/shell/efr32/args.gni @@ -14,6 +14,7 @@ import("//build_overrides/chip.gni") import("//build_overrides/pigweed.gni") +import("${chip_root}/config/standalone/args.gni") import("${chip_root}/src/platform/EFR32/args.gni") efr32_sdk_target = get_label_info(":sdk", "label_no_toolchain") diff --git a/examples/shell/genio/args.gni b/examples/shell/genio/args.gni index bad599b058328d..8d2c11daa5b180 100644 --- a/examples/shell/genio/args.gni +++ b/examples/shell/genio/args.gni @@ -14,6 +14,7 @@ import("//build_overrides/chip.gni") import("//build_overrides/pigweed.gni") +import("${chip_root}/config/standalone/args.gni") import("${chip_root}/src/platform/mt793x/args.gni") mt793x_sdk_target = get_label_info(":sdk", "label_no_toolchain") diff --git a/examples/shell/nxp/k32w/k32w0/args.gni b/examples/shell/nxp/k32w/k32w0/args.gni index e542c9987becf8..e9f2a25ea6f722 100644 --- a/examples/shell/nxp/k32w/k32w0/args.gni +++ b/examples/shell/nxp/k32w/k32w0/args.gni @@ -14,6 +14,7 @@ import("//build_overrides/chip.gni") import("//build_overrides/pigweed.gni") +import("${chip_root}/config/standalone/args.gni") import("${chip_root}/examples/platform/nxp/k32w/k32w0/args.gni") import("${chip_root}/src/platform/nxp/k32w/k32w0/args.gni") diff --git a/examples/shell/qpg/args.gni b/examples/shell/qpg/args.gni index 46bcd2aa1b8297..84ab4b4c8d63e1 100644 --- a/examples/shell/qpg/args.gni +++ b/examples/shell/qpg/args.gni @@ -14,6 +14,7 @@ import("//build_overrides/chip.gni") import("//build_overrides/pigweed.gni") +import("${chip_root}/config/standalone/args.gni") import("${chip_root}/examples/platform/qpg/args.gni") qpg_sdk_target = get_label_info(":sdk", "label_no_toolchain") diff --git a/examples/temperature-measurement-app/esp32/CMakeLists.txt b/examples/temperature-measurement-app/esp32/CMakeLists.txt index dd7332f9661b2d..c1c8251bfdbba4 100644 --- a/examples/temperature-measurement-app/esp32/CMakeLists.txt +++ b/examples/temperature-measurement-app/esp32/CMakeLists.txt @@ -63,8 +63,8 @@ add_subdirectory(third_party/connectedhomeip/third_party/pigweed/repo) add_subdirectory(third_party/connectedhomeip/third_party/nanopb/repo) add_subdirectory(third_party/connectedhomeip/examples/platform/esp32/pw_sys_io) -get_target_property(_target_cxx_flags pw_build.cpp17 INTERFACE_COMPILE_OPTIONS) +get_target_property(_target_cxx_flags pw_build.cpp17._public_config INTERFACE_COMPILE_OPTIONS) list(REMOVE_ITEM _target_cxx_flags $<$:-std=c++17>) list(APPEND _target_cxx_flags $<$:-std=gnu++17>) -set_target_properties(pw_build.cpp17 PROPERTIES INTERFACE_COMPILE_OPTIONS "${_target_cxx_flags}") +set_target_properties(pw_build.cpp17._public_config PROPERTIES INTERFACE_COMPILE_OPTIONS "${_target_cxx_flags}") endif(CONFIG_ENABLE_PW_RPC) diff --git a/examples/temperature-measurement-app/esp32/main/CMakeLists.txt b/examples/temperature-measurement-app/esp32/main/CMakeLists.txt index dce457d2448346..68e49f160f79e0 100644 --- a/examples/temperature-measurement-app/esp32/main/CMakeLists.txt +++ b/examples/temperature-measurement-app/esp32/main/CMakeLists.txt @@ -167,6 +167,7 @@ target_link_libraries(${COMPONENT_LIB} PUBLIC pw_hdlc pw_log pw_rpc.server + pw_sys_io pw_trace_tokenized pw_trace_tokenized.trace_buffer pw_trace_tokenized.rpc_service diff --git a/examples/thermostat/efr32/.gn b/examples/thermostat/efr32/.gn index 0ff42d50e06ef0..4c078f6acefdcc 100644 --- a/examples/thermostat/efr32/.gn +++ b/examples/thermostat/efr32/.gn @@ -24,5 +24,6 @@ default_args = { target_cpu = "arm" target_os = "freertos" chip_openthread_ftd = true + import("//args.gni") } diff --git a/examples/thermostat/efr32/args.gni b/examples/thermostat/efr32/args.gni index 1e5ed4ca14102c..7f4a06e57d9a59 100644 --- a/examples/thermostat/efr32/args.gni +++ b/examples/thermostat/efr32/args.gni @@ -14,6 +14,7 @@ import("//build_overrides/chip.gni") import("//build_overrides/pigweed.gni") +import("${chip_root}/config/standalone/args.gni") import("${chip_root}/src/platform/EFR32/args.gni") efr32_sdk_target = get_label_info(":sdk", "label_no_toolchain") diff --git a/examples/window-app/efr32/.gn b/examples/window-app/efr32/.gn index 0ff42d50e06ef0..4c078f6acefdcc 100644 --- a/examples/window-app/efr32/.gn +++ b/examples/window-app/efr32/.gn @@ -24,5 +24,6 @@ default_args = { target_cpu = "arm" target_os = "freertos" chip_openthread_ftd = true + import("//args.gni") } diff --git a/examples/window-app/efr32/args.gni b/examples/window-app/efr32/args.gni index 26f97a8076d141..c45308a6da7597 100644 --- a/examples/window-app/efr32/args.gni +++ b/examples/window-app/efr32/args.gni @@ -14,6 +14,7 @@ import("//build_overrides/chip.gni") import("//build_overrides/pigweed.gni") +import("${chip_root}/config/standalone/args.gni") import("${chip_root}/src/platform/EFR32/args.gni") efr32_sdk_target = get_label_info(":sdk", "label_no_toolchain") diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index 9e653ff5ae2b85..f6d52e09c73122 100644 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -57,12 +57,26 @@ _bootstrap_or_activate() { local _PW_BANNER_FUNC="_chip_bootstrap_banner" + # Force the Pigweed environment directory to be '.environment' + if [ -z "$PW_ENVIRONMENT_ROOT" ]; then + export PW_ENVIRONMENT_ROOT="$PW_PROJECT_ROOT/.environment" + fi + export _PW_ACTUAL_ENVIRONMENT_ROOT="$(pw_get_env_root)" local _SETUP_SH="$_PW_ACTUAL_ENVIRONMENT_ROOT/activate.sh" export PW_DOCTOR_SKIP_CIPD_CHECKS=1 export PATH # https://bugs.chromium.org/p/pigweed/issues/detail?id=281 + if test -n "$GITHUB_ACTION"; then + mkdir -p "$_PW_ACTUAL_ENVIRONMENT_ROOT" + tee <"${_PW_ACTUAL_ENVIRONMENT_ROOT}/pip.conf" +[global] +cache-dir = ${_PW_ACTUAL_ENVIRONMENT_ROOT}/pip-cache +EOF + export PIP_CONFIG_FILE="$_PW_ACTUAL_ENVIRONMENT_ROOT/pip.conf" + fi + if [ "$_BOOTSTRAP_NAME" = "bootstrap.sh" ] || [ ! -f "$_SETUP_SH" ] || [ ! -s "$_SETUP_SH" ]; then diff --git a/scripts/constraints.txt b/scripts/constraints.txt index 76b66c43ced8ce..3f328fd26be347 100644 --- a/scripts/constraints.txt +++ b/scripts/constraints.txt @@ -160,6 +160,12 @@ mbed-tools==7.55.1.dev1 ; platform_machine != "aarch64" and sys_platform == "lin # via -r requirements.mbed.txt mobly==1.11.1 # via -r requirements.txt +mypy==0.971 + # via -r requirements.txt +mypy-extensions==0.4.3 + # via mypy +mypy-protobuf==3.2.0 + # via -r requirements.txt numpy==1.23.0 # via pandas packaging==20.9 @@ -196,13 +202,12 @@ prettytable==2.5.0 # mbed-os-tools prompt-toolkit==3.0.26 # via ipython -protobuf==3.17.3 - # via -r requirements.txt -psutil==5.9.1 +protobuf==3.20.1 # via # -r requirements.txt - # mobly - # mbed-tools + # mypy-protobuf +psutil==5.9.1 + # via -r requirements.txt ptyprocess==0.7.0 # via pexpect py==1.11.0 @@ -287,7 +292,6 @@ six==1.16.0 # idf-component-manager # junit-xml # mbed-os-tools - # protobuf # python-dateutil # python-engineio # python-socketio @@ -309,6 +313,8 @@ toml==0.10.2 # via # pep517 # pytest +tomli==2.0.1 + # via mypy tornado==6.1 # via -r requirements.txt tqdm==4.61.1 @@ -319,10 +325,15 @@ traitlets==5.0.5 # via # ipython # matplotlib-inline +types-protobuf==3.19.22 + # via + # -r requirements.txt + # mypy-protobuf typing-extensions==4.3.0 ; platform_machine != "aarch64" and sys_platform == "linux" # via # -r requirements.mbed.txt - # mbed-tools + # mobly + # mypy urllib3==1.26.5 # via requests virtualenv==20.4.7 diff --git a/scripts/requirements.txt b/scripts/requirements.txt index c08e4d5ddb6d0c..4bb21d20d64c23 100644 --- a/scripts/requirements.txt +++ b/scripts/requirements.txt @@ -48,7 +48,10 @@ appnope appdirs coloredlogs watchdog -protobuf +mypy==0.971 +mypy-protobuf==3.2.0 +protobuf==3.20.1 +types-protobuf==3.19.22 # scripts/tools/memory anytree diff --git a/scripts/run_codegen_targets.sh b/scripts/run_codegen_targets.sh index 5f8bcd5d51f138..03baee38df88cf 100755 --- a/scripts/run_codegen_targets.sh +++ b/scripts/run_codegen_targets.sh @@ -44,7 +44,7 @@ for name in $(ninja -C "$OUT_DIR" -t targets | grep -E '^gen_' | sed 's/: .*//') done # Code generation (based on zap/matter) -for name in $(ninja -C "$OUT_DIR" -t targets | grep -E '_codegen:' | sed 's/: .*//'); do +for name in $(ninja -C "$OUT_DIR" -t targets | grep -E -v '_no_codegen:' | grep -E '_codegen:' | sed 's/: .*//'); do echo "Generating $name ..." ninja -C "$OUT_DIR" "$name" done diff --git a/src/platform/bouffalolab/BL702/args.gni b/src/platform/bouffalolab/BL702/args.gni index 645a496d23b27a..77396b3b094c8d 100644 --- a/src/platform/bouffalolab/BL702/args.gni +++ b/src/platform/bouffalolab/BL702/args.gni @@ -15,6 +15,7 @@ import("//build_overrides/bouffalolab_iot_sdk.gni") import("//build_overrides/chip.gni") import("//build_overrides/mbedtls.gni") +import("//build_overrides/pigweed.gni") import("${chip_root}/examples/platform/bouffalolab/bl702/args.gni") chip_device_platform = "bl702" @@ -37,3 +38,8 @@ openthread_core_config_platform_check_file = openthread_project_include_dirs = [ "${chip_root}/src/platform/bouffalolab/BL702" ] openthread_external_platform = "${bl702_sdk_build_root}:bl702_sdk" + +pw_build_LINK_DEPS = [ + "$dir_pw_assert:impl", + "$dir_pw_log:impl", +] diff --git a/src/platform/qpg/args.gni b/src/platform/qpg/args.gni index 4bdd6ff4e1c3dd..9f326517e2485e 100644 --- a/src/platform/qpg/args.gni +++ b/src/platform/qpg/args.gni @@ -13,6 +13,7 @@ # limitations under the License. import("//build_overrides/chip.gni") +import("//build_overrides/pigweed.gni") import("//build_overrides/qpg_sdk.gni") import("${qpg_sdk_build_root}/qpg_sdk.gni") @@ -56,3 +57,8 @@ openthread_core_config_deps = [ openthread_external_platform = "${chip_root}/third_party/openthread/platforms/qpg:libopenthread-qpg" + +pw_build_LINK_DEPS = [ + "$dir_pw_assert:impl", + "$dir_pw_log:impl", +] diff --git a/src/test_driver/efr32/.gn b/src/test_driver/efr32/.gn index 7bb85d530fae5c..15c1de83e74c26 100644 --- a/src/test_driver/efr32/.gn +++ b/src/test_driver/efr32/.gn @@ -23,5 +23,11 @@ check_system_includes = true default_args = { target_cpu = "arm" target_os = "freertos" + + pw_build_PIP_CONSTRAINTS = + [ "//third_party/connectedhomeip/scripts/constraints.txt" ] + pw_build_PIP_REQUIREMENTS = + [ "//third_party/connectedhomeip/scripts/requirements.txt" ] + import("//args.gni") } diff --git a/third_party/pigweed/repo b/third_party/pigweed/repo index 9235aeb653e684..9264e6862cc408 160000 --- a/third_party/pigweed/repo +++ b/third_party/pigweed/repo @@ -1 +1 @@ -Subproject commit 9235aeb653e684a6f0b7b563965d85c747281a0f +Subproject commit 9264e6862cc40868a902e5e4ac4e43e2f7eb040d