Fix RPC build and remove unused chip_build_pw_rpc_lib

project-chip · Dec 15, 2021 · 55dd9c6 · 55dd9c6
1 parent ce36e75
commit 55dd9c6
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 89 deletions.
diff --git 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
diff --git a/config/nrfconnect/chip-gn/lib/pw_rpc/pw_rpc.gni b/config/nrfconnect/chip-gn/lib/pw_rpc/pw_rpc.gni
diff --git 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
@@ -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