diff --git a/config/nrfconnect/chip-gn/BUILD.gn b/config/nrfconnect/chip-gn/BUILD.gn index b9a71c9d34334d..63ddd225669d0d 100644 --- a/config/nrfconnect/chip-gn/BUILD.gn +++ b/config/nrfconnect/chip-gn/BUILD.gn @@ -19,22 +19,12 @@ import("${chip_root}/build/chip/tests.gni") assert(current_os == "zephyr") -declare_args() { - chip_build_pw_rpc_lib = false -} - group("nrfconnect") { deps = [ "${chip_root}/src/lib" ] if (chip_build_tests) { deps += [ "${chip_root}/src:tests" ] } - - # Building PW_RPC lib with GN may go obsolete after getting full CMake - # support in Pigweed. - if (chip_build_pw_rpc_lib) { - deps += [ "lib/pw_rpc" ] - } } group("default") { diff --git a/config/nrfconnect/chip-gn/lib/pw_rpc/BUILD.gn b/config/nrfconnect/chip-gn/lib/pw_rpc/BUILD.gn deleted file mode 100644 index e99ab14b29c454..00000000000000 --- a/config/nrfconnect/chip-gn/lib/pw_rpc/BUILD.gn +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright (c) 2020 Project CHIP Authors -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -import("//build_overrides/chip.gni") -import("//build_overrides/pigweed.gni") -import("$dir_pw_build/target_types.gni") - -static_library("pw_rpc") { - output_name = "libPwRpc" - - sources = [ "${dir_pigweed}/pw_hdlc/rpc_example/hdlc_rpc_server.cc" ] - - deps = [ - "$dir_pw_rpc:server", - "$dir_pw_rpc/nanopb:echo_service", - "$dir_pw_rpc/system_server", - "${chip_root}/examples/platform/nrfconnect/pw_sys_io:pw_sys_io_nrfconnect", - "${dir_pigweed}/pw_hdlc:pw_rpc", - dir_pw_assert, - dir_pw_hdlc, - dir_pw_log, - ] - - public_configs = [ "${dir_pigweed}/pw_hdlc:default_config" ] - - output_dir = "${root_out_dir}/lib" - - complete_static_lib = true -} diff --git a/config/nrfconnect/chip-gn/lib/pw_rpc/pw_rpc.gni b/config/nrfconnect/chip-gn/lib/pw_rpc/pw_rpc.gni deleted file mode 100644 index 5732dca57cd060..00000000000000 --- a/config/nrfconnect/chip-gn/lib/pw_rpc/pw_rpc.gni +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright (c) 2021 Project CHIP Authors -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -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_sys_io_BACKEND = - "${chip_root}/examples/platform/nrfconnect/pw_sys_io:pw_sys_io_nrfconnect" -pw_rpc_system_server_BACKEND = - "${chip_root}/examples/common/pigweed:system_rpc_server" - -pw_build_LINK_DEPS = [ - "$dir_pw_assert:impl", - "$dir_pw_log:impl", -] - -dir_pw_third_party_nanopb = "${chip_root}/third_party/nanopb/repo" diff --git a/config/nrfconnect/chip-module/CMakeLists.txt b/config/nrfconnect/chip-module/CMakeLists.txt index 4f9ce318cba0df..9a9ed9529afb41 100644 --- a/config/nrfconnect/chip-module/CMakeLists.txt +++ b/config/nrfconnect/chip-module/CMakeLists.txt @@ -121,10 +121,6 @@ if (NOT CHIP_LIBRARIES) set(CHIP_LIBRARIES -lCHIP) endif() -if (CONFIG_CHIP_PW_RPC) - list(APPEND CHIP_LIBRARIES -lPwRpc) -endif() - # Set up CHIP project configuration file if (CONFIG_CHIP_PROJECT_CONFIG) @@ -180,10 +176,6 @@ find_package(Python3 REQUIRED) # Generate configuration for CHIP GN build system # ============================================================================== -if (CONFIG_CHIP_PW_RPC) - chip_gn_arg_import("${GN_ROOT_TARGET}/lib/pw_rpc/pw_rpc.gni") -endif() - chip_gn_arg_cflags("target_cflags" ${CHIP_CFLAGS}) chip_gn_arg_cflags("target_cflags_c" ${CHIP_CFLAGS_C}) chip_gn_arg_cflags("target_cflags_cc" ${CHIP_CFLAGS_CC}) @@ -202,7 +194,6 @@ chip_gn_arg_bool ("chip_build_tests" CONFIG_CHIP_BUILD_TE chip_gn_arg_bool ("chip_monolithic_tests" CONFIG_CHIP_BUILD_TESTS) chip_gn_arg_bool ("chip_inet_config_enable_tcp_endpoint" CONFIG_CHIP_BUILD_TESTS) chip_gn_arg_bool ("chip_build_libshell" CONFIG_CHIP_LIB_SHELL) -chip_gn_arg_bool ("chip_build_pw_rpc_lib" CONFIG_CHIP_PW_RPC) if (CONFIG_CHIP_ENABLE_DNSSD_SRP) chip_gn_arg_string("chip_mdns" "platform") diff --git a/examples/platform/nrfconnect/pw_sys_io/CMakeLists.txt b/examples/platform/nrfconnect/pw_sys_io/CMakeLists.txt index 84b78c3ebd31ed..e71fbd808e29dc 100644 --- a/examples/platform/nrfconnect/pw_sys_io/CMakeLists.txt +++ b/examples/platform/nrfconnect/pw_sys_io/CMakeLists.txt @@ -4,6 +4,7 @@ add_library(suppress_zephyr_warnings INTERFACE) target_compile_options(suppress_zephyr_warnings INTERFACE -Wno-redundant-decls -Wno-missing-field-initializers + -Wno-cast-qual ) pw_add_module_library(pw_sys_io.nrfconnect