From 87de90d08f6fa0866cf7fd8b145028c7ea544bd8 Mon Sep 17 00:00:00 2001 From: Mathieu Kardous <84793247+mkardous-silabs@users.noreply.github.com> Date: Thu, 23 Jan 2025 16:43:58 -0500 Subject: [PATCH] [Silabs] Add provisioning root argument (#37175) * [SL-UP] Add provisioning root argument (#231) * Restyled by gn --------- Co-authored-by: Restyled.io --- examples/platform/silabs/SiWx917/BUILD.gn | 3 ++- examples/platform/silabs/efr32/BUILD.gn | 3 ++- examples/platform/silabs/provision/BUILD.gn | 4 ++-- src/platform/silabs/SiWx917/BUILD.gn | 6 +++++- src/platform/silabs/efr32/BUILD.gn | 3 ++- src/platform/silabs/provision/args.gni | 19 +++++++++++++++++++ src/test_driver/efr32/BUILD.gn | 3 ++- 7 files changed, 34 insertions(+), 7 deletions(-) create mode 100644 src/platform/silabs/provision/args.gni diff --git a/examples/platform/silabs/SiWx917/BUILD.gn b/examples/platform/silabs/SiWx917/BUILD.gn index 69379c11ff621e..3087a5f64ba9b8 100644 --- a/examples/platform/silabs/SiWx917/BUILD.gn +++ b/examples/platform/silabs/SiWx917/BUILD.gn @@ -18,6 +18,7 @@ import("${chip_root}/examples/common/pigweed/pigweed_rpcs.gni") import("${chip_root}/examples/platform/silabs/args.gni") import("${chip_root}/src/lib/lib.gni") import("${chip_root}/src/platform/device.gni") +import("${chip_root}/src/platform/silabs/provision/args.gni") import("${chip_root}/src/platform/silabs/wifi/args.gni") import("${chip_root}/third_party/silabs/silabs_board.gni") import("${silabs_sdk_build_root}/SiWx917_sdk.gni") @@ -67,7 +68,7 @@ source_set("test-event-trigger") { "${silabs_common_plat_dir}/SilabsTestEventTriggerDelegate.h", ] - deps = [ "${chip_root}/src/platform/silabs/provision:provision-headers" ] + deps = [ "${sl_provision_root}:provision-headers" ] public_configs = [ ":test-event-trigger-config" ] public_deps = [ "${chip_root}/src/app:test-event-trigger", diff --git a/examples/platform/silabs/efr32/BUILD.gn b/examples/platform/silabs/efr32/BUILD.gn index 6d41d79c087c82..8b54549ad64528 100644 --- a/examples/platform/silabs/efr32/BUILD.gn +++ b/examples/platform/silabs/efr32/BUILD.gn @@ -18,6 +18,7 @@ import("${chip_root}/examples/common/pigweed/pigweed_rpcs.gni") import("${chip_root}/src/app/icd/icd.gni") import("${chip_root}/src/lib/lib.gni") import("${chip_root}/src/platform/device.gni") +import("${chip_root}/src/platform/silabs/provision/args.gni") import("${silabs_sdk_build_root}/efr32_sdk.gni") import("${silabs_sdk_build_root}/silabs_board.gni") @@ -71,7 +72,7 @@ source_set("test-event-trigger") { "${silabs_common_plat_dir}/SilabsTestEventTriggerDelegate.h", ] - deps = [ "${chip_root}/src/platform/silabs/provision:provision-headers" ] + deps = [ "${sl_provision_root}:provision-headers" ] public_configs = [ ":test-event-trigger-config" ] public_deps = [ "${chip_root}/src/app:test-event-trigger", diff --git a/examples/platform/silabs/provision/BUILD.gn b/examples/platform/silabs/provision/BUILD.gn index 517dd33c124e47..1ab4744a2e12e4 100644 --- a/examples/platform/silabs/provision/BUILD.gn +++ b/examples/platform/silabs/provision/BUILD.gn @@ -14,6 +14,7 @@ import("//build_overrides/chip.gni") import("//build_overrides/efr32_sdk.gni") +import("${chip_root}/src/platform/silabs/provision/args.gni") import("${silabs_sdk_build_root}/silabs_board.gni") if (wifi_soc) { @@ -48,8 +49,7 @@ source_set("storage") { deps = [ "${chip_root}/src/lib" ] - public_deps = - [ "${chip_root}/src/platform/silabs/provision:provision-headers" ] + public_deps = [ "${sl_provision_root}:provision-headers" ] if (sl_enable_test_event_trigger) { # Temporary workaround since we have duplicated configurations diff --git a/src/platform/silabs/SiWx917/BUILD.gn b/src/platform/silabs/SiWx917/BUILD.gn index 3f7adf8269c61b..bca3755f1decd1 100644 --- a/src/platform/silabs/SiWx917/BUILD.gn +++ b/src/platform/silabs/SiWx917/BUILD.gn @@ -18,6 +18,7 @@ import("${chip_root}/src/platform/device.gni") import("${chip_root}/build/chip/buildconfig_header.gni") import("${chip_root}/src/crypto/crypto.gni") +import("${chip_root}/src/platform/silabs/provision/args.gni") import("${chip_root}/src/platform/silabs/wifi/args.gni") import("${chip_root}/third_party/silabs/SiWx917_sdk.gni") import("${chip_root}/third_party/silabs/silabs_board.gni") @@ -87,7 +88,10 @@ static_library("SiWx917") { "${chip_root}/src/app/icd/server:icd-server-config", "${chip_root}/src/platform:platform_base", ] - deps = [ "${chip_root}/src/platform/logging:headers" ] + deps = [ + "${chip_root}/src/platform/logging:headers", + "${sl_provision_root}:provision-headers", + ] # Add platform crypto implementation if (chip_crypto == "platform") { diff --git a/src/platform/silabs/efr32/BUILD.gn b/src/platform/silabs/efr32/BUILD.gn index cee56ebe666f41..3102a4d924f494 100644 --- a/src/platform/silabs/efr32/BUILD.gn +++ b/src/platform/silabs/efr32/BUILD.gn @@ -17,6 +17,7 @@ import("//build_overrides/chip.gni") import("${chip_root}/build/chip/buildconfig_header.gni") import("${chip_root}/src/crypto/crypto.gni") import("${chip_root}/src/platform/device.gni") +import("${chip_root}/src/platform/silabs/provision/args.gni") import("${chip_root}/third_party/silabs/efr32_sdk.gni") import("${chip_root}/third_party/silabs/silabs_board.gni") @@ -114,7 +115,7 @@ static_library("efr32") { "${chip_root}/src/platform:platform_base", "${chip_root}/src/platform/logging:headers", ] - deps = [ "${silabs_platform_dir}/provision:provision-headers" ] + deps = [ "${sl_provision_root}:provision-headers" ] public_configs = [] # Add platform crypto implementation diff --git a/src/platform/silabs/provision/args.gni b/src/platform/silabs/provision/args.gni new file mode 100644 index 00000000000000..a92793192bed59 --- /dev/null +++ b/src/platform/silabs/provision/args.gni @@ -0,0 +1,19 @@ +# 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") + +declare_args() { + sl_provision_root = "${chip_root}/src/platform/silabs/provision" +} diff --git a/src/test_driver/efr32/BUILD.gn b/src/test_driver/efr32/BUILD.gn index dd1969a5acd256..1ff7a3a505c465 100644 --- a/src/test_driver/efr32/BUILD.gn +++ b/src/test_driver/efr32/BUILD.gn @@ -18,6 +18,7 @@ import("//build_overrides/efr32_sdk.gni") import("//build_overrides/pigweed.gni") import("${build_root}/config/defaults.gni") +import("${chip_root}/src/platform/silabs/provision/args.gni") import("${silabs_sdk_build_root}/efr32_sdk.gni") import("${chip_root}/examples/common/pigweed/pigweed_rpcs.gni") @@ -94,8 +95,8 @@ source_set("efr32_test_main") { "${chip_root}/examples/common/pigweed:system_rpc_server", "${chip_root}/src/lib", "${chip_root}/src/lib/support:pw_tests_wrapper", - "${chip_root}/src/platform/silabs/provision:provision-headers", "${examples_common_plat_dir}/pw_sys_io:pw_sys_io_silabs", + "${sl_provision_root}:provision-headers", ] # OpenThread Settings