Skip to content

Commit 1646916

Browse files
jmartinez-silabspull[bot]
authored andcommitted
Remove pw_kvs and pw_log dependancies (#24011)
1 parent b6f1e40 commit 1646916

File tree

21 files changed

+2
-96
lines changed

21 files changed

+2
-96
lines changed

config/efr32/lib/pw_rpc/pw_rpc.gni

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import("//build_overrides/pigweed.gni")
1717

1818
pw_log_BACKEND = "$dir_pw_log_basic"
1919
pw_assert_BACKEND = "$dir_pw_assert_log:check_backend"
20+
pw_rpc_CONFIG = "$dir_pw_rpc:disable_global_mutex"
2021
pw_sys_io_BACKEND =
2122
"${chip_root}/examples/platform/silabs/efr32/pw_sys_io:pw_sys_io_efr32"
2223

examples/chef/efr32/BUILD.gn

-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ import("${efr32_sdk_build_root}/efr32_sdk.gni")
2424
import("${chip_root}/examples/common/pigweed/pigweed_rpcs.gni")
2525
import("${chip_root}/src/platform/device.gni")
2626

27-
import("${chip_root}/examples/common/pigweed/pigweed_rpcs.gni")
2827
import("${chip_root}/src/app/chip_data_model.gni")
2928

3029
if (chip_enable_pw_rpc) {

examples/chef/efr32/args.gni

-5
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,12 @@
1313
# limitations under the License.
1414

1515
import("//build_overrides/chip.gni")
16-
import("//build_overrides/pigweed.gni")
1716
import("${chip_root}/config/standalone/args.gni")
1817
import("${chip_root}/src/platform/EFR32/args.gni")
1918

2019
efr32_sdk_target = get_label_info(":sdk", "label_no_toolchain")
2120

2221
chip_enable_ota_requestor = true
23-
24-
pw_rpc_CONFIG = "$dir_pw_rpc:disable_global_mutex"
25-
pw_log_BACKEND = "${chip_root}/src/lib/support/pw_log_chip"
26-
pw_assert_BACKEND = "$dir_pw_assert_log:check_backend"
2722
chip_enable_openthread = true
2823
openthread_external_platform =
2924
"${chip_root}/third_party/openthread/platforms/efr32:libopenthread-efr32"

examples/chef/efr32/build_for_wifi_args.gni

-4
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,9 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414
import("//build_overrides/chip.gni")
15-
import("//build_overrides/pigweed.gni")
1615

1716
efr32_sdk_target = get_label_info(":sdk", "label_no_toolchain")
1817
chip_enable_openthread = false
1918
import("${chip_root}/src/platform/EFR32/wifi_args.gni")
2019

2120
chip_enable_ota_requestor = true
22-
23-
pw_log_BACKEND = "${chip_root}/src/lib/support/pw_log_chip"
24-
pw_assert_BACKEND = "$dir_pw_assert_log:check_backend"

examples/light-switch-app/efr32/args.gni

-5
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,12 @@
1313
# limitations under the License.
1414

1515
import("//build_overrides/chip.gni")
16-
import("//build_overrides/pigweed.gni")
1716
import("${chip_root}/config/standalone/args.gni")
1817
import("${chip_root}/src/platform/silabs/EFR32/args.gni")
1918

2019
efr32_sdk_target = get_label_info(":sdk", "label_no_toolchain")
2120

2221
chip_enable_ota_requestor = true
23-
24-
pw_log_BACKEND = "${chip_root}/src/lib/support/pw_log_chip"
25-
pw_assert_BACKEND = "$dir_pw_assert_log:check_backend"
2622
chip_enable_openthread = true
27-
pw_rpc_CONFIG = "$dir_pw_rpc:disable_global_mutex"
2823
openthread_external_platform =
2924
"${chip_root}/third_party/openthread/platforms/efr32:libopenthread-efr32"

examples/light-switch-app/efr32/build_for_wifi_args.gni

-4
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,10 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414
import("//build_overrides/chip.gni")
15-
import("//build_overrides/pigweed.gni")
1615
import("${chip_root}/config/standalone/args.gni")
1716

1817
efr32_sdk_target = get_label_info(":sdk", "label_no_toolchain")
1918
chip_enable_openthread = false
2019
import("${chip_root}/src/platform/silabs/EFR32/wifi_args.gni")
2120

2221
chip_enable_ota_requestor = true
23-
24-
pw_log_BACKEND = "${chip_root}/src/lib/support/pw_log_chip"
25-
pw_assert_BACKEND = "$dir_pw_assert_log:check_backend"

examples/lighting-app/silabs/SiWx917/args.gni

-4
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,12 @@
1313
# limitations under the License.
1414

1515
import("//build_overrides/chip.gni")
16-
import("//build_overrides/pigweed.gni")
1716
import("${chip_root}/config/standalone/args.gni")
1817
import("${chip_root}/src/platform/silabs/SiWx917/args.gni")
1918

2019
efr32_sdk_target = get_label_info(":sdk", "label_no_toolchain")
2120

2221
chip_enable_ota_requestor = true
23-
24-
pw_log_BACKEND = "${chip_root}/src/lib/support/pw_log_chip"
25-
pw_assert_BACKEND = "$dir_pw_assert_log:check_backend"
2622
chip_enable_openthread = true
2723
pw_rpc_CONFIG = "$dir_pw_rpc:disable_global_mutex"
2824

examples/lighting-app/silabs/SiWx917/build_for_wifi_args.gni

-4
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,10 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414
import("//build_overrides/chip.gni")
15-
import("//build_overrides/pigweed.gni")
1615
import("${chip_root}/config/standalone/args.gni")
1716

1817
efr32_sdk_target = get_label_info(":sdk", "label_no_toolchain")
1918
chip_enable_openthread = false
2019
import("${chip_root}/src/platform/silabs/SiWx917/wifi_args.gni")
2120

2221
chip_enable_ota_requestor = true
23-
24-
pw_log_BACKEND = "${chip_root}/src/lib/support/pw_log_chip"
25-
pw_assert_BACKEND = "$dir_pw_assert_log:check_backend"

examples/lighting-app/silabs/efr32/args.gni

-5
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,13 @@
1313
# limitations under the License.
1414

1515
import("//build_overrides/chip.gni")
16-
import("//build_overrides/pigweed.gni")
1716
import("${chip_root}/config/standalone/args.gni")
1817
import("${chip_root}/src/platform/silabs/EFR32/args.gni")
1918

2019
efr32_sdk_target = get_label_info(":sdk", "label_no_toolchain")
2120

2221
chip_enable_ota_requestor = true
23-
24-
pw_log_BACKEND = "${chip_root}/src/lib/support/pw_log_chip"
25-
pw_assert_BACKEND = "$dir_pw_assert_log:check_backend"
2622
chip_enable_openthread = true
27-
pw_rpc_CONFIG = "$dir_pw_rpc:disable_global_mutex"
2823

2924
openthread_external_platform =
3025
"${chip_root}/third_party/openthread/platforms/efr32:libopenthread-efr32"

examples/lighting-app/silabs/efr32/build_for_wifi_args.gni

-4
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,10 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414
import("//build_overrides/chip.gni")
15-
import("//build_overrides/pigweed.gni")
1615
import("${chip_root}/config/standalone/args.gni")
1716

1817
efr32_sdk_target = get_label_info(":sdk", "label_no_toolchain")
1918
chip_enable_openthread = false
2019
import("${chip_root}/src/platform/silabs/EFR32/wifi_args.gni")
2120

2221
chip_enable_ota_requestor = true
23-
24-
pw_log_BACKEND = "${chip_root}/src/lib/support/pw_log_chip"
25-
pw_assert_BACKEND = "$dir_pw_assert_log:check_backend"

examples/lock-app/efr32/args.gni

-5
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,12 @@
1313
# limitations under the License.
1414

1515
import("//build_overrides/chip.gni")
16-
import("//build_overrides/pigweed.gni")
1716
import("${chip_root}/config/standalone/args.gni")
1817
import("${chip_root}/src/platform/silabs/EFR32/args.gni")
1918

2019
efr32_sdk_target = get_label_info(":sdk", "label_no_toolchain")
2120

2221
chip_enable_ota_requestor = true
23-
2422
chip_enable_openthread = true
25-
pw_log_BACKEND = "${chip_root}/src/lib/support/pw_log_chip"
26-
pw_assert_BACKEND = "$dir_pw_assert_log:check_backend"
27-
pw_rpc_CONFIG = "$dir_pw_rpc:disable_global_mutex"
2823
openthread_external_platform =
2924
"${chip_root}/third_party/openthread/platforms/efr32:libopenthread-efr32"

examples/lock-app/efr32/build_for_wifi_args.gni

-4
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,10 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414
import("//build_overrides/chip.gni")
15-
import("//build_overrides/pigweed.gni")
1615
import("${chip_root}/config/standalone/args.gni")
1716

1817
efr32_sdk_target = get_label_info(":sdk", "label_no_toolchain")
1918
chip_enable_openthread = false
2019
import("${chip_root}/src/platform/silabs/EFR32/wifi_args.gni")
2120

2221
chip_enable_ota_requestor = true
23-
24-
pw_log_BACKEND = "${chip_root}/src/lib/support/pw_log_chip"
25-
pw_assert_BACKEND = "$dir_pw_assert_log:check_backend"

examples/persistent-storage/efr32/args.gni

-4
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,7 @@
1313
# limitations under the License.
1414

1515
import("//build_overrides/chip.gni")
16-
import("//build_overrides/pigweed.gni")
1716
import("${chip_root}/config/standalone/args.gni")
1817
import("${chip_root}/src/platform/EFR32/args.gni")
1918

2019
efr32_sdk_target = get_label_info(":sdk", "label_no_toolchain")
21-
22-
pw_log_BACKEND = "${chip_root}/src/lib/support/pw_log_chip"
23-
pw_assert_BACKEND = "$dir_pw_assert_log:check_backend"

examples/shell/efr32/args.gni

-3
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,11 @@
1313
# limitations under the License.
1414

1515
import("//build_overrides/chip.gni")
16-
import("//build_overrides/pigweed.gni")
1716
import("${chip_root}/config/standalone/args.gni")
1817
import("${chip_root}/src/platform/EFR32/args.gni")
1918

2019
efr32_sdk_target = get_label_info(":sdk", "label_no_toolchain")
2120

22-
pw_log_BACKEND = "${chip_root}/src/lib/support/pw_log_chip"
23-
pw_assert_BACKEND = "$dir_pw_assert_log:check_backend"
2421
chip_enable_openthread = true
2522
chip_openthread_ftd = true
2623
chip_build_libshell = true

examples/thermostat/efr32/args.gni

-5
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,13 @@
1313
# limitations under the License.
1414

1515
import("//build_overrides/chip.gni")
16-
import("//build_overrides/pigweed.gni")
1716
import("${chip_root}/config/standalone/args.gni")
1817
import("${chip_root}/src/platform/silabs/EFR32/args.gni")
1918

2019
efr32_sdk_target = get_label_info(":sdk", "label_no_toolchain")
2120

2221
chip_enable_ota_requestor = true
23-
24-
pw_log_BACKEND = "${chip_root}/src/lib/support/pw_log_chip"
25-
pw_assert_BACKEND = "$dir_pw_assert_log:check_backend"
2622
chip_enable_openthread = true
27-
pw_rpc_CONFIG = "$dir_pw_rpc:disable_global_mutex"
2823

2924
openthread_external_platform =
3025
"${chip_root}/third_party/openthread/platforms/efr32:libopenthread-efr32"

examples/thermostat/efr32/build_for_wifi_args.gni

-4
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,10 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414
import("//build_overrides/chip.gni")
15-
import("//build_overrides/pigweed.gni")
1615
import("${chip_root}/config/standalone/args.gni")
1716

1817
efr32_sdk_target = get_label_info(":sdk", "label_no_toolchain")
1918
chip_enable_openthread = false
2019
import("${chip_root}/src/platform/silabs/EFR32/wifi_args.gni")
2120

2221
chip_enable_ota_requestor = true
23-
24-
pw_log_BACKEND = "${chip_root}/src/lib/support/pw_log_chip"
25-
pw_assert_BACKEND = "$dir_pw_assert_log:check_backend"

examples/window-app/efr32/args.gni

-4
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,12 @@
1313
# limitations under the License.
1414

1515
import("//build_overrides/chip.gni")
16-
import("//build_overrides/pigweed.gni")
1716
import("${chip_root}/config/standalone/args.gni")
1817
import("${chip_root}/src/platform/silabs/EFR32/args.gni")
1918

2019
efr32_sdk_target = get_label_info(":sdk", "label_no_toolchain")
2120

2221
chip_enable_ota_requestor = true
23-
24-
pw_log_BACKEND = "${chip_root}/src/lib/support/pw_log_chip"
25-
pw_assert_BACKEND = "$dir_pw_assert_log:check_backend"
2622
chip_enable_openthread = true
2723
openthread_external_platform =
2824
"${chip_root}/third_party/openthread/platforms/efr32:libopenthread-efr32"

examples/window-app/efr32/build_for_wifi_args.gni

-4
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,9 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414
import("//build_overrides/chip.gni")
15-
import("//build_overrides/pigweed.gni")
1615

1716
efr32_sdk_target = get_label_info(":sdk", "label_no_toolchain")
1817
chip_enable_openthread = false
1918
import("${chip_root}/src/platform/silabs/EFR32/wifi_args.gni")
2019

2120
chip_enable_ota_requestor = true
22-
23-
pw_log_BACKEND = "${chip_root}/src/lib/support/pw_log_chip"
24-
pw_assert_BACKEND = "$dir_pw_assert_log:check_backend"

src/platform/silabs/EFR32/BUILD.gn

+1-11
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
# limitations under the License.
1414

1515
import("//build_overrides/chip.gni")
16-
import("//build_overrides/pigweed.gni")
1716

1817
import("${chip_root}/src/platform/device.gni")
1918

@@ -84,19 +83,10 @@ static_library("EFR32") {
8483
]
8584
}
8685

87-
# Add pigweed KVS
88-
deps = [
89-
"$dir_pw_kvs:crc16",
90-
"$dir_pw_log",
91-
]
92-
public_deps += [
93-
"$dir_pw_checksum",
94-
"$dir_pw_kvs",
95-
]
9686
if (chip_enable_openthread) {
9787
public_deps += [ "${chip_root}/third_party/openthread:openthread" ]
9888

99-
deps += [ "${chip_root}/third_party/openthread:openthread_cli" ]
89+
deps = [ "${chip_root}/third_party/openthread:openthread_cli" ]
10090

10191
sources += [
10292
"${silabs_platform_dir}/ThreadStackManagerImpl.h",

src/platform/silabs/SiWx917/BUILD.gn

-11
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
# limitations under the License.
1414

1515
import("//build_overrides/chip.gni")
16-
import("//build_overrides/pigweed.gni")
1716

1817
import("${chip_root}/src/platform/device.gni")
1918

@@ -68,16 +67,6 @@ static_library("SiWx917") {
6867

6968
public_deps = [ "${chip_root}/src/platform:platform_base" ]
7069

71-
# Add pigweed KVS
72-
deps = [
73-
"$dir_pw_kvs:crc16",
74-
"$dir_pw_log",
75-
]
76-
public_deps += [
77-
"$dir_pw_checksum",
78-
"$dir_pw_kvs",
79-
]
80-
8170
if (chip_enable_wifi) {
8271
sources += [
8372
"${silabs_platform_dir}/ConnectivityManagerImpl_WIFI.cpp",

src/platform/silabs/SiWx917/wifi_args.gni

-5
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,3 @@ chip_build_tests = false
4646
chip_config_memory_management = "platform"
4747
chip_mdns = "minimal"
4848
chip_enable_pw_rpc = false
49-
50-
pw_build_LINK_DEPS = [
51-
"$dir_pw_assert:impl",
52-
"$dir_pw_log:impl",
53-
]

0 commit comments

Comments
 (0)