From 2732777446862e304510fbb612b1cddf525d92c0 Mon Sep 17 00:00:00 2001 From: Junior Martinez <67972863+jmartinez-silabs@users.noreply.github.com> Date: Mon, 12 Dec 2022 10:30:37 -0500 Subject: [PATCH] Remove pw_kvs and pw_log dependancies (#24011) --- config/efr32/lib/pw_rpc/pw_rpc.gni | 1 + examples/chef/efr32/BUILD.gn | 1 - examples/chef/efr32/args.gni | 5 ----- examples/chef/efr32/build_for_wifi_args.gni | 4 ---- examples/light-switch-app/efr32/args.gni | 5 ----- .../light-switch-app/efr32/build_for_wifi_args.gni | 4 ---- examples/lighting-app/silabs/SiWx917/args.gni | 4 ---- .../silabs/SiWx917/build_for_wifi_args.gni | 4 ---- examples/lighting-app/silabs/efr32/args.gni | 5 ----- .../silabs/efr32/build_for_wifi_args.gni | 4 ---- examples/lock-app/efr32/args.gni | 5 ----- examples/lock-app/efr32/build_for_wifi_args.gni | 4 ---- examples/persistent-storage/efr32/args.gni | 4 ---- examples/shell/efr32/args.gni | 3 --- examples/thermostat/efr32/args.gni | 5 ----- examples/thermostat/efr32/build_for_wifi_args.gni | 4 ---- examples/window-app/efr32/args.gni | 4 ---- examples/window-app/efr32/build_for_wifi_args.gni | 4 ---- src/platform/silabs/EFR32/BUILD.gn | 12 +----------- src/platform/silabs/SiWx917/BUILD.gn | 11 ----------- src/platform/silabs/SiWx917/wifi_args.gni | 5 ----- 21 files changed, 2 insertions(+), 96 deletions(-) diff --git a/config/efr32/lib/pw_rpc/pw_rpc.gni b/config/efr32/lib/pw_rpc/pw_rpc.gni index 5fd576d93c4a98..a72cb4d90f6dd1 100644 --- a/config/efr32/lib/pw_rpc/pw_rpc.gni +++ b/config/efr32/lib/pw_rpc/pw_rpc.gni @@ -17,6 +17,7 @@ import("//build_overrides/pigweed.gni") pw_log_BACKEND = "$dir_pw_log_basic" pw_assert_BACKEND = "$dir_pw_assert_log:check_backend" +pw_rpc_CONFIG = "$dir_pw_rpc:disable_global_mutex" pw_sys_io_BACKEND = "${chip_root}/examples/platform/silabs/efr32/pw_sys_io:pw_sys_io_efr32" diff --git a/examples/chef/efr32/BUILD.gn b/examples/chef/efr32/BUILD.gn index 4c2ac5296436b5..e5464094d29cf3 100644 --- a/examples/chef/efr32/BUILD.gn +++ b/examples/chef/efr32/BUILD.gn @@ -24,7 +24,6 @@ import("${efr32_sdk_build_root}/efr32_sdk.gni") import("${chip_root}/examples/common/pigweed/pigweed_rpcs.gni") import("${chip_root}/src/platform/device.gni") -import("${chip_root}/examples/common/pigweed/pigweed_rpcs.gni") import("${chip_root}/src/app/chip_data_model.gni") if (chip_enable_pw_rpc) { diff --git a/examples/chef/efr32/args.gni b/examples/chef/efr32/args.gni index 907b12f7064bb9..0ad1d033053e34 100644 --- a/examples/chef/efr32/args.gni +++ b/examples/chef/efr32/args.gni @@ -13,17 +13,12 @@ # limitations under the License. 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") chip_enable_ota_requestor = true - -pw_rpc_CONFIG = "$dir_pw_rpc:disable_global_mutex" -pw_log_BACKEND = "${chip_root}/src/lib/support/pw_log_chip" -pw_assert_BACKEND = "$dir_pw_assert_log:check_backend" chip_enable_openthread = true openthread_external_platform = "${chip_root}/third_party/openthread/platforms/efr32:libopenthread-efr32" diff --git a/examples/chef/efr32/build_for_wifi_args.gni b/examples/chef/efr32/build_for_wifi_args.gni index 4a3bdfd804ae19..902b282b9e4014 100644 --- a/examples/chef/efr32/build_for_wifi_args.gni +++ b/examples/chef/efr32/build_for_wifi_args.gni @@ -12,13 +12,9 @@ # See the License for the specific language governing permissions and # limitations under the License. import("//build_overrides/chip.gni") -import("//build_overrides/pigweed.gni") efr32_sdk_target = get_label_info(":sdk", "label_no_toolchain") chip_enable_openthread = false import("${chip_root}/src/platform/EFR32/wifi_args.gni") chip_enable_ota_requestor = true - -pw_log_BACKEND = "${chip_root}/src/lib/support/pw_log_chip" -pw_assert_BACKEND = "$dir_pw_assert_log:check_backend" diff --git a/examples/light-switch-app/efr32/args.gni b/examples/light-switch-app/efr32/args.gni index f75911d38c37a8..c7b087a4ee4f49 100644 --- a/examples/light-switch-app/efr32/args.gni +++ b/examples/light-switch-app/efr32/args.gni @@ -13,17 +13,12 @@ # limitations under the License. import("//build_overrides/chip.gni") -import("//build_overrides/pigweed.gni") import("${chip_root}/config/standalone/args.gni") import("${chip_root}/src/platform/silabs/EFR32/args.gni") efr32_sdk_target = get_label_info(":sdk", "label_no_toolchain") chip_enable_ota_requestor = true - -pw_log_BACKEND = "${chip_root}/src/lib/support/pw_log_chip" -pw_assert_BACKEND = "$dir_pw_assert_log:check_backend" chip_enable_openthread = true -pw_rpc_CONFIG = "$dir_pw_rpc:disable_global_mutex" openthread_external_platform = "${chip_root}/third_party/openthread/platforms/efr32:libopenthread-efr32" diff --git a/examples/light-switch-app/efr32/build_for_wifi_args.gni b/examples/light-switch-app/efr32/build_for_wifi_args.gni index 363d2be9e6f362..86d8a19bbc36ce 100644 --- a/examples/light-switch-app/efr32/build_for_wifi_args.gni +++ b/examples/light-switch-app/efr32/build_for_wifi_args.gni @@ -12,7 +12,6 @@ # 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("${chip_root}/config/standalone/args.gni") efr32_sdk_target = get_label_info(":sdk", "label_no_toolchain") @@ -20,6 +19,3 @@ chip_enable_openthread = false import("${chip_root}/src/platform/silabs/EFR32/wifi_args.gni") chip_enable_ota_requestor = true - -pw_log_BACKEND = "${chip_root}/src/lib/support/pw_log_chip" -pw_assert_BACKEND = "$dir_pw_assert_log:check_backend" diff --git a/examples/lighting-app/silabs/SiWx917/args.gni b/examples/lighting-app/silabs/SiWx917/args.gni index 8b382c4520b390..ed17fa3c6b8e6a 100644 --- a/examples/lighting-app/silabs/SiWx917/args.gni +++ b/examples/lighting-app/silabs/SiWx917/args.gni @@ -13,16 +13,12 @@ # limitations under the License. import("//build_overrides/chip.gni") -import("//build_overrides/pigweed.gni") import("${chip_root}/config/standalone/args.gni") import("${chip_root}/src/platform/silabs/SiWx917/args.gni") efr32_sdk_target = get_label_info(":sdk", "label_no_toolchain") chip_enable_ota_requestor = true - -pw_log_BACKEND = "${chip_root}/src/lib/support/pw_log_chip" -pw_assert_BACKEND = "$dir_pw_assert_log:check_backend" chip_enable_openthread = true pw_rpc_CONFIG = "$dir_pw_rpc:disable_global_mutex" diff --git a/examples/lighting-app/silabs/SiWx917/build_for_wifi_args.gni b/examples/lighting-app/silabs/SiWx917/build_for_wifi_args.gni index 8a0192cd5e9c3f..b1a0be42ca9351 100644 --- a/examples/lighting-app/silabs/SiWx917/build_for_wifi_args.gni +++ b/examples/lighting-app/silabs/SiWx917/build_for_wifi_args.gni @@ -12,7 +12,6 @@ # 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("${chip_root}/config/standalone/args.gni") efr32_sdk_target = get_label_info(":sdk", "label_no_toolchain") @@ -20,6 +19,3 @@ chip_enable_openthread = false import("${chip_root}/src/platform/silabs/SiWx917/wifi_args.gni") chip_enable_ota_requestor = true - -pw_log_BACKEND = "${chip_root}/src/lib/support/pw_log_chip" -pw_assert_BACKEND = "$dir_pw_assert_log:check_backend" diff --git a/examples/lighting-app/silabs/efr32/args.gni b/examples/lighting-app/silabs/efr32/args.gni index d216faa0a07dae..6b0d9a8e2eb8a6 100644 --- a/examples/lighting-app/silabs/efr32/args.gni +++ b/examples/lighting-app/silabs/efr32/args.gni @@ -13,18 +13,13 @@ # limitations under the License. import("//build_overrides/chip.gni") -import("//build_overrides/pigweed.gni") import("${chip_root}/config/standalone/args.gni") import("${chip_root}/src/platform/silabs/EFR32/args.gni") efr32_sdk_target = get_label_info(":sdk", "label_no_toolchain") chip_enable_ota_requestor = true - -pw_log_BACKEND = "${chip_root}/src/lib/support/pw_log_chip" -pw_assert_BACKEND = "$dir_pw_assert_log:check_backend" chip_enable_openthread = true -pw_rpc_CONFIG = "$dir_pw_rpc:disable_global_mutex" openthread_external_platform = "${chip_root}/third_party/openthread/platforms/efr32:libopenthread-efr32" diff --git a/examples/lighting-app/silabs/efr32/build_for_wifi_args.gni b/examples/lighting-app/silabs/efr32/build_for_wifi_args.gni index 363d2be9e6f362..86d8a19bbc36ce 100644 --- a/examples/lighting-app/silabs/efr32/build_for_wifi_args.gni +++ b/examples/lighting-app/silabs/efr32/build_for_wifi_args.gni @@ -12,7 +12,6 @@ # 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("${chip_root}/config/standalone/args.gni") efr32_sdk_target = get_label_info(":sdk", "label_no_toolchain") @@ -20,6 +19,3 @@ chip_enable_openthread = false import("${chip_root}/src/platform/silabs/EFR32/wifi_args.gni") chip_enable_ota_requestor = true - -pw_log_BACKEND = "${chip_root}/src/lib/support/pw_log_chip" -pw_assert_BACKEND = "$dir_pw_assert_log:check_backend" diff --git a/examples/lock-app/efr32/args.gni b/examples/lock-app/efr32/args.gni index 23f22fbb83d459..c7b087a4ee4f49 100644 --- a/examples/lock-app/efr32/args.gni +++ b/examples/lock-app/efr32/args.gni @@ -13,17 +13,12 @@ # limitations under the License. import("//build_overrides/chip.gni") -import("//build_overrides/pigweed.gni") import("${chip_root}/config/standalone/args.gni") import("${chip_root}/src/platform/silabs/EFR32/args.gni") efr32_sdk_target = get_label_info(":sdk", "label_no_toolchain") chip_enable_ota_requestor = true - chip_enable_openthread = true -pw_log_BACKEND = "${chip_root}/src/lib/support/pw_log_chip" -pw_assert_BACKEND = "$dir_pw_assert_log:check_backend" -pw_rpc_CONFIG = "$dir_pw_rpc:disable_global_mutex" openthread_external_platform = "${chip_root}/third_party/openthread/platforms/efr32:libopenthread-efr32" diff --git a/examples/lock-app/efr32/build_for_wifi_args.gni b/examples/lock-app/efr32/build_for_wifi_args.gni index 363d2be9e6f362..86d8a19bbc36ce 100644 --- a/examples/lock-app/efr32/build_for_wifi_args.gni +++ b/examples/lock-app/efr32/build_for_wifi_args.gni @@ -12,7 +12,6 @@ # 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("${chip_root}/config/standalone/args.gni") efr32_sdk_target = get_label_info(":sdk", "label_no_toolchain") @@ -20,6 +19,3 @@ chip_enable_openthread = false import("${chip_root}/src/platform/silabs/EFR32/wifi_args.gni") chip_enable_ota_requestor = true - -pw_log_BACKEND = "${chip_root}/src/lib/support/pw_log_chip" -pw_assert_BACKEND = "$dir_pw_assert_log:check_backend" diff --git a/examples/persistent-storage/efr32/args.gni b/examples/persistent-storage/efr32/args.gni index 312d2eadede066..45a6fed651fb8a 100644 --- a/examples/persistent-storage/efr32/args.gni +++ b/examples/persistent-storage/efr32/args.gni @@ -13,11 +13,7 @@ # limitations under the License. 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") - -pw_log_BACKEND = "${chip_root}/src/lib/support/pw_log_chip" -pw_assert_BACKEND = "$dir_pw_assert_log:check_backend" diff --git a/examples/shell/efr32/args.gni b/examples/shell/efr32/args.gni index 5807e23caa6c57..7f35899b5cad51 100644 --- a/examples/shell/efr32/args.gni +++ b/examples/shell/efr32/args.gni @@ -13,14 +13,11 @@ # limitations under the License. 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") -pw_log_BACKEND = "${chip_root}/src/lib/support/pw_log_chip" -pw_assert_BACKEND = "$dir_pw_assert_log:check_backend" chip_enable_openthread = true chip_openthread_ftd = true chip_build_libshell = true diff --git a/examples/thermostat/efr32/args.gni b/examples/thermostat/efr32/args.gni index d216faa0a07dae..6b0d9a8e2eb8a6 100644 --- a/examples/thermostat/efr32/args.gni +++ b/examples/thermostat/efr32/args.gni @@ -13,18 +13,13 @@ # limitations under the License. import("//build_overrides/chip.gni") -import("//build_overrides/pigweed.gni") import("${chip_root}/config/standalone/args.gni") import("${chip_root}/src/platform/silabs/EFR32/args.gni") efr32_sdk_target = get_label_info(":sdk", "label_no_toolchain") chip_enable_ota_requestor = true - -pw_log_BACKEND = "${chip_root}/src/lib/support/pw_log_chip" -pw_assert_BACKEND = "$dir_pw_assert_log:check_backend" chip_enable_openthread = true -pw_rpc_CONFIG = "$dir_pw_rpc:disable_global_mutex" openthread_external_platform = "${chip_root}/third_party/openthread/platforms/efr32:libopenthread-efr32" diff --git a/examples/thermostat/efr32/build_for_wifi_args.gni b/examples/thermostat/efr32/build_for_wifi_args.gni index 363d2be9e6f362..86d8a19bbc36ce 100644 --- a/examples/thermostat/efr32/build_for_wifi_args.gni +++ b/examples/thermostat/efr32/build_for_wifi_args.gni @@ -12,7 +12,6 @@ # 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("${chip_root}/config/standalone/args.gni") efr32_sdk_target = get_label_info(":sdk", "label_no_toolchain") @@ -20,6 +19,3 @@ chip_enable_openthread = false import("${chip_root}/src/platform/silabs/EFR32/wifi_args.gni") chip_enable_ota_requestor = true - -pw_log_BACKEND = "${chip_root}/src/lib/support/pw_log_chip" -pw_assert_BACKEND = "$dir_pw_assert_log:check_backend" diff --git a/examples/window-app/efr32/args.gni b/examples/window-app/efr32/args.gni index 212e702163aa6a..c7b087a4ee4f49 100644 --- a/examples/window-app/efr32/args.gni +++ b/examples/window-app/efr32/args.gni @@ -13,16 +13,12 @@ # limitations under the License. import("//build_overrides/chip.gni") -import("//build_overrides/pigweed.gni") import("${chip_root}/config/standalone/args.gni") import("${chip_root}/src/platform/silabs/EFR32/args.gni") efr32_sdk_target = get_label_info(":sdk", "label_no_toolchain") chip_enable_ota_requestor = true - -pw_log_BACKEND = "${chip_root}/src/lib/support/pw_log_chip" -pw_assert_BACKEND = "$dir_pw_assert_log:check_backend" chip_enable_openthread = true openthread_external_platform = "${chip_root}/third_party/openthread/platforms/efr32:libopenthread-efr32" diff --git a/examples/window-app/efr32/build_for_wifi_args.gni b/examples/window-app/efr32/build_for_wifi_args.gni index 8fe1081d6d9b72..8a00db97bd958d 100644 --- a/examples/window-app/efr32/build_for_wifi_args.gni +++ b/examples/window-app/efr32/build_for_wifi_args.gni @@ -12,13 +12,9 @@ # See the License for the specific language governing permissions and # limitations under the License. import("//build_overrides/chip.gni") -import("//build_overrides/pigweed.gni") efr32_sdk_target = get_label_info(":sdk", "label_no_toolchain") chip_enable_openthread = false import("${chip_root}/src/platform/silabs/EFR32/wifi_args.gni") chip_enable_ota_requestor = true - -pw_log_BACKEND = "${chip_root}/src/lib/support/pw_log_chip" -pw_assert_BACKEND = "$dir_pw_assert_log:check_backend" diff --git a/src/platform/silabs/EFR32/BUILD.gn b/src/platform/silabs/EFR32/BUILD.gn index b67c63c486a719..bce4f104280e5e 100644 --- a/src/platform/silabs/EFR32/BUILD.gn +++ b/src/platform/silabs/EFR32/BUILD.gn @@ -13,7 +13,6 @@ # limitations under the License. import("//build_overrides/chip.gni") -import("//build_overrides/pigweed.gni") import("${chip_root}/src/platform/device.gni") @@ -84,19 +83,10 @@ static_library("EFR32") { ] } - # Add pigweed KVS - deps = [ - "$dir_pw_kvs:crc16", - "$dir_pw_log", - ] - public_deps += [ - "$dir_pw_checksum", - "$dir_pw_kvs", - ] if (chip_enable_openthread) { public_deps += [ "${chip_root}/third_party/openthread:openthread" ] - deps += [ "${chip_root}/third_party/openthread:openthread_cli" ] + deps = [ "${chip_root}/third_party/openthread:openthread_cli" ] sources += [ "${silabs_platform_dir}/ThreadStackManagerImpl.h", diff --git a/src/platform/silabs/SiWx917/BUILD.gn b/src/platform/silabs/SiWx917/BUILD.gn index 4026e1cd40c8f4..7f361f313cd771 100644 --- a/src/platform/silabs/SiWx917/BUILD.gn +++ b/src/platform/silabs/SiWx917/BUILD.gn @@ -13,7 +13,6 @@ # limitations under the License. import("//build_overrides/chip.gni") -import("//build_overrides/pigweed.gni") import("${chip_root}/src/platform/device.gni") @@ -68,16 +67,6 @@ static_library("SiWx917") { public_deps = [ "${chip_root}/src/platform:platform_base" ] - # Add pigweed KVS - deps = [ - "$dir_pw_kvs:crc16", - "$dir_pw_log", - ] - public_deps += [ - "$dir_pw_checksum", - "$dir_pw_kvs", - ] - if (chip_enable_wifi) { sources += [ "${silabs_platform_dir}/ConnectivityManagerImpl_WIFI.cpp", diff --git a/src/platform/silabs/SiWx917/wifi_args.gni b/src/platform/silabs/SiWx917/wifi_args.gni index 88d554d2f1040b..a913be42065da9 100644 --- a/src/platform/silabs/SiWx917/wifi_args.gni +++ b/src/platform/silabs/SiWx917/wifi_args.gni @@ -46,8 +46,3 @@ chip_build_tests = false chip_config_memory_management = "platform" chip_mdns = "minimal" chip_enable_pw_rpc = false - -pw_build_LINK_DEPS = [ - "$dir_pw_assert:impl", - "$dir_pw_log:impl", -]